diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-10-20 21:05:00 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-10-20 21:05:00 +0200 |
| commit | b6d6a16b2a1c5e4593ba5ff22a2e11f23dca93c9 (patch) | |
| tree | 161ab89ea18a3975667b96358b523bfe993948a5 | |
| parent | 8b7a81175d4fb785a3b03d66181af6c4841e3190 (diff) | |
| parent | a12a0d0c0316c842580b2f7906a4f5cb5746e7f4 (diff) | |
| download | NetworkManager-b6d6a16b2a1c5e4593ba5ff22a2e11f23dca93c9.tar.gz | |
license: merge branch 'th/keyfile-relicense-as-lgpl'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/514
| -rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile-internal.h | 2 | ||||
| -rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile-utils.c | 2 | ||||
| -rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile-utils.h | 2 | ||||
| -rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libnm-core/nm-keyfile/nm-keyfile-internal.h b/libnm-core/nm-keyfile/nm-keyfile-internal.h index 77372f3ac9..a0a153d75c 100644 --- a/libnm-core/nm-keyfile/nm-keyfile-internal.h +++ b/libnm-core/nm-keyfile/nm-keyfile-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2008 Novell, Inc. * Copyright (C) 2015 Red Hat, Inc. diff --git a/libnm-core/nm-keyfile/nm-keyfile-utils.c b/libnm-core/nm-keyfile/nm-keyfile-utils.c index be12f8a83f..05a4412469 100644 --- a/libnm-core/nm-keyfile/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile/nm-keyfile-utils.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2010 Red Hat, Inc. */ diff --git a/libnm-core/nm-keyfile/nm-keyfile-utils.h b/libnm-core/nm-keyfile/nm-keyfile-utils.h index efad8317b0..9d18f5b54d 100644 --- a/libnm-core/nm-keyfile/nm-keyfile-utils.h +++ b/libnm-core/nm-keyfile/nm-keyfile-utils.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2010 - 2015 Red Hat, Inc. */ diff --git a/libnm-core/nm-keyfile/nm-keyfile.c b/libnm-core/nm-keyfile/nm-keyfile.c index a8aefe6349..4c09039d07 100644 --- a/libnm-core/nm-keyfile/nm-keyfile.c +++ b/libnm-core/nm-keyfile/nm-keyfile.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2008 - 2009 Novell, Inc. * Copyright (C) 2008 - 2017 Red Hat, Inc. |