diff options
author | Thomas Haller <thaller@redhat.com> | 2020-10-20 16:14:11 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-10-20 16:14:48 +0200 |
commit | 335d13c354a5288887fd9350b5256194555402d5 (patch) | |
tree | aec71239ef4c94ed0b445702efb40db9b9ad5438 | |
parent | dcd162c6192b871deaff9c0c7b1231172063e31e (diff) | |
parent | afc5266460885f1ee1009714f8efdd3ac9a1b3b7 (diff) | |
download | NetworkManager-335d13c354a5288887fd9350b5256194555402d5.tar.gz |
license: merge branch 'th/fix-lgpl-license-violations' (part 2)
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/390
-rw-r--r-- | libnm-core/nm-core-types.h | 2 | ||||
-rw-r--r-- | libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h | 2 | ||||
-rw-r--r-- | libnm/nm-types.h | 2 | ||||
-rw-r--r-- | shared/nm-test-utils-impl.c | 2 | ||||
-rw-r--r-- | shared/nm-udev-aux/nm-udev-utils.c | 2 | ||||
-rw-r--r-- | shared/nm-udev-aux/nm-udev-utils.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h index 80466e351d..c2ac48e618 100644 --- a/libnm-core/nm-core-types.h +++ b/libnm-core/nm-core-types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2014 - 2018 Red Hat, Inc. */ diff --git a/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h b/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h index 80546a83d2..3f8f6516cc 100644 --- a/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h +++ b/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2008 - 2012 Red Hat, Inc. */ diff --git a/libnm/nm-types.h b/libnm/nm-types.h index 099002bd9f..765d7cdae6 100644 --- a/libnm/nm-types.h +++ b/libnm/nm-types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2014 - 2018 Red Hat, Inc. */ diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c index 7b71484e59..0e0d97a494 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -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/shared/nm-udev-aux/nm-udev-utils.c b/shared/nm-udev-aux/nm-udev-utils.c index 8131c04e39..3337ff5c96 100644 --- a/shared/nm-udev-aux/nm-udev-utils.c +++ b/shared/nm-udev-aux/nm-udev-utils.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2017 Red Hat, Inc. */ diff --git a/shared/nm-udev-aux/nm-udev-utils.h b/shared/nm-udev-aux/nm-udev-utils.h index f24659eb32..00fefdd07e 100644 --- a/shared/nm-udev-aux/nm-udev-utils.h +++ b/shared/nm-udev-aux/nm-udev-utils.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2017 Red Hat, Inc. */ |