summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-05-11 13:17:01 +0200
committerLubomir Rintel <lkundrak@v3.sk>2016-05-11 13:24:08 +0200
commit8f6d416768cf69932999b1fc2ab4231321761657 (patch)
tree44c60950320c3aa89fec78f6d402c1140afbffb4
parentb198efb28fe9022c3164ee6d10b0af82f91d24eb (diff)
downloadNetworkManager-8f6d416768cf69932999b1fc2ab4231321761657.tar.gz
release: bump version to 1.2.21.2.2
-rw-r--r--configure.ac2
-rw-r--r--shared/nm-version-macros.h.in5
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index a87a13636c..7bb3779ef0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
dnl The NM version number
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [2])
-m4_define([nm_micro_version], [1])
+m4_define([nm_micro_version], [2])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version])
m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 3323e312a3..3e0ef361c0 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -69,9 +69,10 @@
#define NM_VERSION_1_0 (NM_ENCODE_VERSION (1, 0, 0))
#define NM_VERSION_1_2 (NM_ENCODE_VERSION (1, 2, 0))
#define NM_VERSION_1_2_2 (NM_ENCODE_VERSION (1, 2, 2))
+#define NM_VERSION_1_2_4 (NM_ENCODE_VERSION (1, 2, 4))
#define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0))
-#define NM_VERSION_CUR_STABLE NM_VERSION_1_2
-#define NM_VERSION_NEXT_STABLE NM_VERSION_1_2_2
+#define NM_VERSION_CUR_STABLE NM_VERSION_1_2_2
+#define NM_VERSION_NEXT_STABLE NM_VERSION_1_2_4
#endif /* __NM_VERSION_MACROS_H__ */