diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /shared/nm-version-macros.h | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'shared/nm-version-macros.h')
| -rw-r--r-- | shared/nm-version-macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 4eccbde7..a50650fd 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 (12) +#define NM_MINOR_VERSION (14) /** * NM_MICRO_VERSION: @@ -73,9 +73,9 @@ #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) #define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0)) -#define NM_VERSION_1_12_2 (NM_ENCODE_VERSION (1, 12, 2)) -#define NM_VERSION_1_12_4 (NM_ENCODE_VERSION (1, 12, 4)) -#define NM_VERSION_1_12_6 (NM_ENCODE_VERSION (1, 12, 6)) +#define NM_VERSION_1_14 (NM_ENCODE_VERSION (1, 14, 0)) +#define NM_VERSION_1_14_2 (NM_ENCODE_VERSION (1, 14, 2)) +#define NM_VERSION_1_14_4 (NM_ENCODE_VERSION (1, 14, 4)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * |