Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 46ac6db18daf23ff151a29b6733556d87ad8c057 Merge: 9b5d4ed bb69cb6 Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed Oct 23 05:00:31 2013 +0800

Merge branch 'next'

46ac6db18daf23ff151a29b6733556d87ad8c057 icmp_socket.c | 128 +++++++++++++++++++++++++++++++++++---------------------- icmp_socket.h | 2 +- packet.h | 2 + routing.c | 121 ++++++++++++++++++++++++++++++++--------------------- sysfs.c | 2 +- types.h | 2 +- 6 files changed, 159 insertions(+), 98 deletions(-)