summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-09-18 13:17:35 +0200
committerThomas Haller <thaller@redhat.com>2018-09-18 13:36:37 +0200
commitd506400ef3b3d979d9616d9260669bd9c5f4ac23 (patch)
tree96951db0338beea4701c2131a70d578444f55fb5
parent2e4ca55635ec40164237074c8c137fbe32584ba2 (diff)
release: bump version to 1.12.5 (development)1.12.5-dev
-rw-r--r--configure.ac2
-rw-r--r--meson.build2
-rw-r--r--shared/nm-version-macros.h.in1
3 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index c2885d88f0..bbfe6c048d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in"
dnl - update number in meson.build
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [12])
-m4_define([nm_micro_version], [4])
+m4_define([nm_micro_version], [5])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version])
diff --git a/meson.build b/meson.build
index d997f479b2..c157480ff7 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
# - add corresponding NM_VERSION_x_y_z macros in
# "shared/nm-version-macros.h.in"
# - update number in configure.ac
- version: '1.12.4',
+ version: '1.12.5',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 792070acc5..522652e96a 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -75,6 +75,7 @@
#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0))
#define NM_VERSION_1_12_2 (NM_ENCODE_VERSION (1, 12, 2))
#define NM_VERSION_1_12_4 (NM_ENCODE_VERSION (1, 12, 4))
+#define NM_VERSION_1_12_6 (NM_ENCODE_VERSION (1, 12, 6))
/* For releases, NM_API_VERSION is equal to NM_VERSION.
*