aboutsummaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2014-06-04 15:28:27 -0700
committerDmitry Shmidt <dimitrysh@google.com>2014-06-04 15:28:27 -0700
commitb5d893b5dec601a58c3ce0fc9e5d6da3816ce97a (patch)
tree0c6b77653c6a1e5c3bb0cdff0843f9d7b85cca36 /src/common
parent717574375e969e8272c6d1a26137286eac158abb (diff)
downloadandroid_external_wpa_supplicant_8-b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a.tar.gz
android_external_wpa_supplicant_8-b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a.tar.bz2
android_external_wpa_supplicant_8-b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a.zip
Cumulative patch from commit 6280df31bbbd015cb857630868a49c373325ba10
6280df3 Include CONTRIBUTIONS file in the release tarballs b63b9a7 Change version information for the 2.2 release 6a98f67 ChangeLog entries for v2.2 d4b951f Fix offchannel TX not to retransmit pending frame on callback 95b6bca Add rsn_pairwise bits to set_ieee8021x() driver_ops 95f6f6a RADIUS/EAP server: Use longer username buffer to avoid truncation 5dff6df Fix off-by-one bounds checking in printf_encode() Change-Id: I531fbbb2111da96174b89fd99507716df25bb1e6 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/common')
-rw-r--r--src/common/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/version.h b/src/common/version.h
index fb3b4f50..340afc7e 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -5,6 +5,6 @@
#define VERSION_STR_POSTFIX ""
#endif /* VERSION_STR_POSTFIX */
-#define VERSION_STR "2.2-devel" VERSION_STR_POSTFIX
+#define VERSION_STR "2.2" VERSION_STR_POSTFIX
#endif /* VERSION_H */