Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
commit cdc11ae60b904b2e3e14a5ad09a7cd110dd89708 Merge: 0ca83ef c506b11 Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Mar 10 13:47:16 2013 +0800
Merge branch 'maint' into next
Conflicts: compat.h network-coding.c
bat_iv_ogm.c | 12 +++---- bridge_loop_avoidance.c | 39 +++++++++------------- compat.h | 22 +++++++++++++ distributed-arp-table.c | 15 ++++----- gateway_client.c | 13 +++----- main.c | 6 ++-- network-coding.c | 28 ++++++---------- originator.c | 31 ++++++++---------- originator.h | 3 +- routing.c | 6 ++-- send.c | 6 ++-- translation-table.c | 82 ++++++++++++++++++++--------------------------- vis.c | 38 +++++++++------------- 13 files changed, 134 insertions(+), 167 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc cdc11ae60b904b2e3e14a5ad09a7cd110dd89708