[commits] batctl; branch, master, updated. v2012.1.0-17-gc03a0c7

The following commit has been merged in the master branch: commit c03a0c7445de336c637fe515128b69a74276b8d1 Author: Sven Eckelmann sven@narfation.org Date: Fri Mar 30 18:45:51 2012 +0200

batctl: Start new development cycle

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

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

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

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