The following commit has been merged in the merge/master branch: commit 1e73793d319c051fe5907a64310cf0d83afe155a Author: Simon Wunderlich sw@simonwunderlich.de Date: Mon Nov 23 20:30:15 2015 +0100

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index ebd8af0..da9f16c 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 "2015.2" +#define BATADV_SOURCE_VERSION "2016.0" #endif

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