diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
| commit | 229bfa11c4d56b4c1017c81c7dbafbedd15e3153 (patch) | |
| tree | edfc7357b6494a5c0cb016bb88d61b623daa9876 /shared/nm-version-macros.h | |
| parent | 6318db9c78b4fe207dfe700cfac11a675fc63dc9 (diff) | |
| parent | 7514efc2f38c9ace4557d4e69d68e7d380389030 (diff) | |
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
Diffstat (limited to 'shared/nm-version-macros.h')
| -rw-r--r-- | shared/nm-version-macros.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index e8bd4f84..3c3b1732 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -37,7 +37,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (2) +#define NM_MINOR_VERSION (4) /** * NM_MICRO_VERSION: @@ -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 (0) /** * NM_CHECK_VERSION: @@ -68,12 +68,9 @@ #define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 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_2_6 (NM_ENCODE_VERSION (1, 2, 6)) #define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_2_4 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_2_6 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_2 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_4 #endif /* __NM_VERSION_MACROS_H__ */ |