[commits] batctl; branch, master, updated. v2011.1.0-1-g16692bd

The following commit has been merged in the master branch: commit 16692bd9341f49d7c2f27ee6e3074d62f53df71e Merge: 92a485041a2e9a25992217ef03ced8095a1aedb5 f810f7d0a914fcb1b1adcb057ae83a426dc983f9 Author: Sven Eckelmann sven@narfation.org Date: Sun Apr 17 18:18:47 2011 +0200

Merge commit 'v2011.1.0'

diff --combined main.h index e67c03b,98aa40f..2f4841a --- a/main.h +++ b/main.h @@@ -21,7 -21,7 +21,7 @@@

- #define SOURCE_VERSION "devel" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ -#define SOURCE_VERSION "2011.1.0" ++#define SOURCE_VERSION "devel"

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