diff options
| author |  Sadie Powell | 2024-06-07 12:30:19 +0100 |
|---|---|---|
| committer | Sadie Powell | 2024-06-07 12:30:19 +0100 |
| commit | 843eb4ca8a2eedc564d39baaffcb0de60897de4e (patch) | |
| tree | a9b2fe6062d1fbac3d8fe4b3e9fcf0d9a31fa99b /make | |
| parent | Require C++20. (diff) | |
| parent | Update the list of distributions we provide packages for. (diff) | |
Merge branch 'insp4' into master.
Diffstat (limited to 'make')
| -rwxr-xr-x | make/calcdep.pl | 2 | ||||
| -rw-r--r-- | make/configure.pm | 1 | ||||
| -rw-r--r-- | make/directive.pm | 2 | ||||
| -rw-r--r-- | make/template/apparmor | 2 | ||||
| -rw-r--r-- | make/template/main.mk | 3 | ||||
| -rw-r--r-- | make/test/compiler.cpp | 3 | ||||
| -rw-r--r-- | make/test/compiler_info.cpp | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/make/calcdep.pl b/make/calcdep.pl index f6bb5d1f0..5d84eaad0 100755 --- a/make/calcdep.pl +++ b/make/calcdep.pl @@ -2,8 +2,8 @@ # # InspIRCd -- Internet Relay Chat Daemon # +# Copyright (C) 2015-2022 Sadie Powell <sadie@witchery.services> # Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com> -# Copyright (C) 2013, 2015-2019, 2021 Sadie Powell <sadie@witchery.services> # Copyright (C) 2012 Robby <robby@chatbelgie.be> # Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org> # diff --git a/make/configure.pm b/make/configure.pm index 82aa677dd..aab05b551 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -1,6 +1,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # +# Copyright (C) 2024 satmd <satmd@satmd.de> # Copyright (C) 2020 Nicole Kleinhoff <ilbelkyr@shalture.org> # Copyright (C) 2013-2022 Sadie Powell <sadie@witchery.services> # Copyright (C) 2012 Robby <robby@chatbelgie.be> diff --git a/make/directive.pm b/make/directive.pm index 865d151e3..92a8c26f1 100644 --- a/make/directive.pm +++ b/make/directive.pm @@ -1,7 +1,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2016-2022 Sadie Powell <sadie@witchery.services> +# Copyright (C) 2016-2023 Sadie Powell <sadie@witchery.services> # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/template/apparmor b/make/template/apparmor index c92bbf598..dc1cbd8ed 100644 --- a/make/template/apparmor +++ b/make/template/apparmor @@ -2,7 +2,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2020-2022 Sadie Powell <sadie@witchery.services> +# Copyright (C) 2020-2022, 2024 Sadie Powell <sadie@witchery.services> # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/template/main.mk b/make/template/main.mk index 295d9e550..88e12a6c9 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -3,10 +3,9 @@ # InspIRCd -- Internet Relay Chat Daemon # # Copyright (C) 2018 Puck Meerburg <puck@puckipedia.com> +# Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com> # Copyright (C) 2012-2023 Sadie Powell <sadie@witchery.services> -# Copyright (C) 2012, 2015-2016 Attila Molnar <attilamolnar@hush.com> # Copyright (C) 2012 Robby <robby@chatbelgie.be> -# Copyright (C) 2012 Christoph Egger <christoph@debian.org> # Copyright (C) 2012 ChrisTX <xpipe@hotmail.de> # Copyright (C) 2010 Dennis Friis <peavey@inspircd.org> # Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org> diff --git a/make/test/compiler.cpp b/make/test/compiler.cpp index d3559ca3d..2f4efe8a0 100644 --- a/make/test/compiler.cpp +++ b/make/test/compiler.cpp @@ -1,8 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com> - * Copyright (C) 2014-2015, 2021 Sadie Powell <sadie@witchery.services> + * Copyright (C) 2014 Sadie Powell <sadie@witchery.services> * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/test/compiler_info.cpp b/make/test/compiler_info.cpp index e1f2e1db9..b67a9f152 100644 --- a/make/test/compiler_info.cpp +++ b/make/test/compiler_info.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017, 2022 Sadie Powell <sadie@witchery.services> + * Copyright (C) 2017, 2021-2022 Sadie Powell <sadie@witchery.services> * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public |