The following commit has been merged in the master branch: commit 71b75d0e95b7699394f1d7d76628df719e859ef1 Author: Simon Wunderlich sw@simonwunderlich.de Date: Mon Jul 21 16:05:35 2014 +0200

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 257840e..a1fcd88 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.3.0" +#define BATADV_SOURCE_VERSION "2014.4.0" #endif

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