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

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

commit d8b57ce3a456f16e3b55a2cc12277b77ee6c3c7c Author: Sven Eckelmann sven@narfation.org Date: Sun Apr 17 18:35:29 2011 +0000

doc: batman-adv/Release-todo

d8b57ce3a456f16e3b55a2cc12277b77ee6c3c7c batman-adv/Release-todo.textile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index c86e7cc4..397bfbf4 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -48,7 +48,7 @@ h2. Distributions

h2. Aftershow

-* [ ] Merge differences (README, CHANGELOG, ...) into master branch -* [ ] Merge current next into maint (must be fast-forward or pre-tagging steps were done wrong) +* [x] Merge differences (README, CHANGELOG, ...) into master branch +* [x] Merge current next into maint (must be fast-forward or pre-tagging steps were done wrong) * [ ] Get patches for next release from master-rebase/batctl-rebase repository * [ ] Rebase patches in next on top of linux-next and send it to kernel maintainers for future kernels