[commits] [batctl] next: Merge branch 'next' (ec5b689)

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

On branch : next

commit ec5b68924368d21cad3dfc616910410e4730eb87 Merge: 2c2cb26 1e46ae6 Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Aug 4 17:49:44 2015 +0200

Merge branch 'next'

ec5b68924368d21cad3dfc616910410e4730eb87 main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc main.h index 1cd7389,98f4119..dfb8eb4 --- a/main.h +++ b/main.h @@@ -22,10 -22,8 +22,10 @@@ #ifndef _BATCTL_MAIN_H #define _BATCTL_MAIN_H

+#include <stdint.h> + #ifndef SOURCE_VERSION - #define SOURCE_VERSION "2015.1" + #define SOURCE_VERSION "2015.2" #endif

#define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"