diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /shared/nm-version-macros.h | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
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. * |