{section: Active source code release branches, or where should my code go?} -Current as of Dec 12, 2010. +Current as of February 14, 2011. -*: Code that implements new features, aka code targeted for v7.5.x, should go into branch *master*. +*: Code that implements new features, aka code targeted for v7.7.x, should go into branch *master*. -*: Bug fixes to new features or Very Important new features _might_ go into *V7_5_5-branch*, but only with permission of the wrangler. If so, they should then be merged into *master*. +*: Urgent bug fixes to new features might go into *V7_5_6-branch*, but only with permission from the wrangler. They should then be merged into V7_6-branch and from there to master. -*: Bug fixes should go into branch *V7_4-branch* (which will eventually be 7.4.5), and be merged into *master*. +*: Bug fixes to new features should go into *V7_6-branch*. Very Important new featurse _might_ go into this branch, but run it by Flightworthy first. Commits should then be merged into master. -{strike} -*: Very Important bug fixes should go into *V7_4_3-branch*, but only with permission of the wrangler. If so, they should then be merged into *V7_4-branch*, and from there into *master*. -{endstrike} +*: Bug fixes should go into branch *V7_4-branch* (which _may_ eventually be 7.4.5), and should then be merged into V7_6-branch, and from there into master. *: Recently abandoned branches that should not receive new code: V7_4_2-branch, V7_2-branch, V7_3-branch, V7_3_2-branch.