Repository : ssh://git@open-mesh.org/batctl

On branch : master

commit 21dd460808437190dc053b1d88c24f4b310b2118 Merge: a395164 76fbaec Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Jan 5 12:26:59 2013 +0800

Merge branch 'next'

21dd460808437190dc053b1d88c24f4b310b2118 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 | 2 +- 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 +- vis.c | 2 +- vis.h | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-)