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

On branch : master

commit 39188390be2b409bbf705c29d25881c4ea39a42f Merge: ef7cfaa a105185 Author: Sven Eckelmann sven@narfation.org Date: Tue Oct 18 14:21:23 2016 +0200

Merge branch 'next'

39188390be2b409bbf705c29d25881c4ea39a42f genl.c | 4 ++-- main.h | 2 +- man/batctl.8 | 6 +++--- netlink.c | 10 +++++----- tp_meter.c | 7 ++++--- 5 files changed, 15 insertions(+), 14 deletions(-)