[commits] [batctl] master: Merge branch 'next' (7f4991e)

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

On branch : master

commit 7f4991efa91a136287e9a951b92f87457001e46e Merge: 4f29a4f 4c39fb8 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Nov 9 12:36:10 2014 +0800

Merge branch 'next'

7f4991efa91a136287e9a951b92f87457001e46e README | 1 + main.h | 7 +++ man/batctl.8 | 5 +- tcpdump.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- tcpdump.h | 1 + 5 files changed, 179 insertions(+), 6 deletions(-)