[commits] batctl; branch, master, updated. v2012.0.0-6-ge89112f

The following commit has been merged in the master branch: commit e89112f060dc29e62666ffa8f8b6e46370166dd3 Author: Sven Eckelmann sven@narfation.org Date: Sun Feb 5 15:26:13 2012 +0100

batctl: Start new development cycle

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/main.h b/main.h index 22c11b5..e81508f 100644 --- a/main.h +++ b/main.h @@ -20,7 +20,7 @@ */

#ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.0.0" +#define SOURCE_VERSION "2012.1.0" #endif

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