The following commit has been merged in the merge/master branch: commit 11d07bad4b5bd703d6b60ef088877fa782a2dc69 Author: Sven Eckelmann sven@narfation.org Date: Sun Aug 19 21:48:25 2012 +0200

batman-adv: Start new development cycle

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

diff --git a/main.h b/main.h index f9a3115..f2227df 100644 --- a/main.h +++ b/main.h @@ -26,7 +26,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv"

#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2012.3.0" +#define BATADV_SOURCE_VERSION "2012.4.0" #endif

/* B.A.T.M.A.N. parameters */