[commits] [batman-adv] master: Merge branch 'next' (125d5a8)

postmaster at open-mesh.org postmaster at open-mesh.org
Sun Apr 26 13:35:08 CEST 2015


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

On branch  : master

>---------------------------------------------------------------

commit 125d5a81efcb29538b454098a69e5b70f81ee20e
Merge: 620c91f 3351c8c
Author: Marek Lindner <mareklindner at neomailbox.ch>
Date:   Sun Apr 26 19:34:40 2015 +0800

    Merge branch 'next'



>---------------------------------------------------------------

125d5a81efcb29538b454098a69e5b70f81ee20e
 Makefile.kbuild         |    2 +-
 bat_algo.h              |    2 +-
 bat_iv_ogm.c            |    2 +-
 bitarray.c              |    2 +-
 bitarray.h              |    2 +-
 bridge_loop_avoidance.c |    2 +-
 bridge_loop_avoidance.h |    2 +-
 debugfs.c               |    2 +-
 debugfs.h               |    2 +-
 distributed-arp-table.c |    2 +-
 distributed-arp-table.h |    2 +-
 fragmentation.c         |    2 +-
 fragmentation.h         |    2 +-
 gateway_client.c        |    2 +-
 gateway_client.h        |    2 +-
 gateway_common.c        |    2 +-
 gateway_common.h        |    2 +-
 hard-interface.c        |    2 +-
 hard-interface.h        |    2 +-
 hash.c                  |    2 +-
 hash.h                  |    2 +-
 icmp_socket.c           |    2 +-
 icmp_socket.h           |    2 +-
 main.c                  |    2 +-
 main.h                  |    2 +-
 multicast.c             |    2 +-
 multicast.h             |    2 +-
 network-coding.c        |    2 +-
 network-coding.h        |    2 +-
 originator.c            |    2 +-
 originator.h            |    2 +-
 packet.h                |    2 +-
 routing.c               |    2 +-
 routing.h               |    2 +-
 send.c                  |    2 +-
 send.h                  |    2 +-
 soft-interface.c        |    2 +-
 soft-interface.h        |    2 +-
 sysfs.c                 |    2 +-
 sysfs.h                 |    2 +-
 translation-table.c     |    2 +-
 translation-table.h     |    2 +-
 types.h                 |    2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)




More information about the commits mailing list