Commit 08dc83bd authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Merge branch 'babeld-1.2-branch'

Conflicts:
	message.c
parents df7c427d d782b22b
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 9 September 2011: babeld 1.2.0
* Merged the interference-aware branch ("babelz"). Please see the * Merged the interference-aware branch ("babelz"). Please see the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment