The following commit has been merged in the master branch: commit 3f2532fcde67faf496fa21c5c04c5e8cf73c9e01 Author: Simon Wunderlich sw@simonwunderlich.de Date: Thu Mar 13 12:16:01 2014 +0100

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 515dce7..770dc89 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv"

#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2014.1.0" +#define BATADV_SOURCE_VERSION "2014.2.0" #endif

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