Repository : ssh://git@open-mesh.org/batctl
On branch : master
commit f168d4709339b5aa025291333ed55f45e0a16f32 Merge: 98fdad4 5e6072e Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Jan 5 01:58:27 2014 +0800
Merge branch 'next'
f168d4709339b5aa025291333ed55f45e0a16f32 Makefile | 2 +- allocate.h | 2 +- bat-hosts.c | 2 +- bat-hosts.h | 2 +- bisect_iv.c | 2 +- bisect_iv.h | 2 +- debug.c | 2 +- debug.h | 2 +- functions.c | 2 +- functions.h | 2 +- hash.c | 2 +- hash.h | 2 +- ioctl.c | 2 +- ioctl.h | 2 +- list-batman.c | 2 +- list-batman.h | 2 +- main.c | 2 +- main.h | 4 ++-- packet.h | 2 +- ping.c | 2 +- ping.h | 2 +- sys.c | 2 +- sys.h | 2 +- tcpdump.c | 2 +- tcpdump.h | 2 +- traceroute.c | 2 +- traceroute.h | 2 +- translate.c | 2 +- translate.h | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-)