The main branch is now used for v2.11 development

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/CONTRIBUTIONS b/CONTRIBUTIONS
index b2064dc83443c1a5288022ae37561f4e16857db5..6c8187cb190d2e19ecbcbcab8474f0da4f6acbff 100644 (file)
--- a/CONTRIBUTIONS
+++ b/CONTRIBUTIONS
@@ -37,7 +37,7 @@ without moderation. You can subscribe to the list at this address:
 http://lists.infradead.org/mailman/listinfo/hostap
 
 The message should contain an inlined patch against the current
-development branch (i.e., the master branch of
+development branch (i.e., the main branch of
 git://w1.fi/hostap.git). Please make sure the software you use for
 sending the patch does not corrupt whitespace. If that cannot be fixed
 for some reason, it is better to include an attached version of the

diff --git a/src/common/version.h b/src/common/version.h
index 7502f58e0b874ec327635f63d63a738e26e3fb65..4409e1ca659be09a6aafe5cf7bbd6c0bd578c7d4 100644 (file)
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -9,6 +9,6 @@
 #define GIT_VERSION_STR_POSTFIX ""
 #endif /* GIT_VERSION_STR_POSTFIX */
 
-#define VERSION_STR "2.10" VERSION_STR_POSTFIX GIT_VERSION_STR_POSTFIX
+#define VERSION_STR "2.11-devel" VERSION_STR_POSTFIX GIT_VERSION_STR_POSTFIX
 
 #endif /* VERSION_H */