Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit b3b036c5e081b4aa8c3cfb5e4cfb5541c21ed2b3 Merge: 2e4003c a1eecdd Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Mar 25 18:18:23 2013 +0800

Merge branch 'next'

b3b036c5e081b4aa8c3cfb5e4cfb5541c21ed2b3 compat.h | 3 +++ gateway_client.c | 2 +- hard-interface.c | 30 ++++++++++++++++++++++++++++-- main.c | 2 +- network-coding.c | 8 ++++---- originator.c | 4 ++-- vis.c | 4 ++-- 7 files changed, 41 insertions(+), 12 deletions(-)