Merge branch 'babeld-1.2-branch'

Conflicts: message.c

Merge branch 'babeld-1.2-branch'
Conflicts: message.c
08dc83bd · Juliusz Chroboczek · df7c427d · d782b22b · 08dc83bd
Commit 08dc83bd authored Oct 16, 2011 by Juliusz Chroboczek
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CHANGES CHANGES +5 -0

No files found.
--- a/CHANGES
+++ b/CHANGES
+16 October 2011: babeld-1.2.1
+
+  * Fixed an incorrect assertion that would cause a crash when -w was
+    being used (reported by Thomas McLure).
+
 9 September 2011: babeld 1.2.0

  * Merged the interference-aware branch ("babelz").  Please see the