Repository : ssh://git@open-mesh.org/doc

On branches: backup-redmine/2017-07-13,master

commit dcec334bbc12a6ea73328472216186c79367263f Author: Sven Eckelmann sven@narfation.org Date: Fri Mar 30 18:49:30 2012 +0000

doc: batman-adv/Release-todo

dcec334bbc12a6ea73328472216186c79367263f batman-adv/Release-todo.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index 2c6ff14b..e7ba8ad3 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -47,8 +47,8 @@ h2. Distributions

h2. Aftershow

-* [ ] Merge next into master branch (to get changes on README, CHANGELOG, ...) -* [ ] Merge current git tag into maint (must be fast-forward or pre-tagging steps were done wrong) -* [ ] Merge patches from master into next (to get all the fancy new features) +* [x] Merge next into master branch (to get changes on README, CHANGELOG, ...) +* [x] Merge current git tag into maint (must be fast-forward or pre-tagging steps were done wrong) +* [x] Merge patches from master into next (to get all the fancy new features) * [ ] Rebase patches in next on top of last linux -rc1 and send it to kernel maintainers for future kernels ([[SubmittingLinux]]) * [ ] Enable daily check for next/master (symbol check, cppcheck, feature check) \ No newline at end of file