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/template | |
| 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/template')
| -rw-r--r-- | make/template/apparmor | 2 | ||||
| -rw-r--r-- | make/template/main.mk | 3 |
2 files changed, 2 insertions, 3 deletions
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> |