diff options
| author | Michael Biebl <biebl@debian.org> | 2016-05-11 17:09:14 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-05-11 17:09:14 +0200 |
| commit | c74718aa5a356199a1ff957b2579153d54be9dd5 (patch) | |
| tree | cf3ade8c1e7322792ec140f09ee5e083382c5c48 /shared/nm-version-macros.h | |
| parent | 6bb523977deede318916fe01c78f776d215cebff (diff) | |
| parent | 73e152af6e3fb4f5848bfb8394484026ff119003 (diff) | |
Merge tag 'upstream/1.2.2'
Upstream version 1.2.2
Diffstat (limited to 'shared/nm-version-macros.h')
| -rw-r--r-- | shared/nm-version-macros.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index be94ce76..50c9748d 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 (0) +#define NM_MICRO_VERSION (2) /** * NM_CHECK_VERSION: @@ -68,9 +68,11 @@ #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_4 (NM_ENCODE_VERSION (1, 4, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_0 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_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__ */ |