summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-10-09 15:06:56 +0200
committerThomas Haller <thaller@redhat.com>2019-10-09 15:06:56 +0200
commitefb18be2cb412457f41f036b7248179b22da981c (patch)
tree196a4b7a7dc377b323337a9302b5edc5cecc5e2e
parent92b19a1e69305bddf48993001a0c86cd17050cac (diff)
release: bump version to 1.18.5 (development)1.18.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 33badfac0c..a646b1da72 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], [18])
-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 3994fa86ae..991c7a8d1e 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.18.4',
+ version: '1.18.5',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 6d04772df5..aeac4c274e 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -78,6 +78,7 @@
#define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0))
#define NM_VERSION_1_18_2 (NM_ENCODE_VERSION (1, 18, 2))
#define NM_VERSION_1_18_4 (NM_ENCODE_VERSION (1, 18, 4))
+#define NM_VERSION_1_18_6 (NM_ENCODE_VERSION (1, 18, 6))
/* For releases, NM_API_VERSION is equal to NM_VERSION.
*