diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
| commit | bed53db3e064450b56e23ec654f40a3bafe58815 (patch) | |
| tree | 314508d6c904b1224dab2070e0cfdd5a02d7dd89 /shared/nm-version-macros.h.in | |
| parent | 7135a6e87c938139e3a5db121d62dcaa783345d1 (diff) | |
| parent | 58f8be580039b0575b197b9573a1c92745d96d30 (diff) | |
Merge tag 'upstream/1.5.90' into experimental
Upstream version 1.5.90
Diffstat (limited to 'shared/nm-version-macros.h.in')
| -rw-r--r-- | shared/nm-version-macros.h.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 536ea9ea..169e4950 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -69,11 +69,11 @@ #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_4 (NM_ENCODE_VERSION (1, 4, 0)) -#define NM_VERSION_1_4_2 (NM_ENCODE_VERSION (1, 4, 2)) -#define NM_VERSION_1_4_4 (NM_ENCODE_VERSION (1, 4, 4)) -#define NM_VERSION_1_4_6 (NM_ENCODE_VERSION (1, 4, 6)) +#define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_4_4 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_4_6 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_4 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6 + +#define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) #endif /* __NM_VERSION_MACROS_H__ */ |