diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-03-26 08:35:51 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-03-26 08:35:51 -0400 |
| commit | 95410d8dcdd0433894612785c89b821b9de4cc04 (patch) | |
| tree | 66c57586825b10af593a84a00ee885aa257b5196 /shared | |
| parent | 6b60d03d200147c516db40716b1c58e2a86db1a5 (diff) | |
| parent | aee9265c9325331914e9fd42ce06e063fabdfcab (diff) | |
Merge tag 'debian/1.10.6-2' into bionic
network-manager Debian release 1.10.6-2
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-version-macros.h | 6 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 8d6a3c7c..b309997c 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (4) +#define NM_MICRO_VERSION (6) /** * NM_CHECK_VERSION: @@ -76,8 +76,8 @@ #define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) #define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_4 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_4 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_6 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_6 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 46a544be..f92bed82 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -76,8 +76,8 @@ #define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) #define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_4 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_4 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_6 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_6 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) |