[asterisk-dev] 1.6.1 ?

[Sean Bright]

Johansson Olle E wrote:
> I must have missed something, but I haven't seen any message about  
> 1.6.1 on this list.
> 
> What's the policy for merging stuff now? Did 1.6.0 die and we're  
> heading directly towards 1.6.1?

1.6.1 is everything that has changed in trunk since 1.6.0 was branched.
 AFAIK, both 1.6.0 and 1.6.1 are feature frozen, and applicable fixes in
trunk are merged to both branches.  New features continue to go into trunk.

The merge process is:

trunk -> 1.6.0
trunk -> 1.6.1

(mergetrunk6 will work with both)

-- 
Sean Bright
sean.bright at gmail.com