Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
commit bf140c39fa3890e167e024082e897ac3fe38f29b Merge: 469d4b4 3269ba9 Author: Marek Lindner lindner_marek@yahoo.de Date: Thu May 9 17:02:32 2013 +0800
Merge branch 'next'
bf140c39fa3890e167e024082e897ac3fe38f29b distributed-arp-table.c | 13 +++++++++++++ network-coding.c | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)