summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-04-22 05:26:02 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-04-22 05:26:02 +0200
commit2d48c62d6a4e5d9387e2935dd53ff07357639f0e (patch)
tree90ce2bfd9a8ff3301e6d9d5d6c557553ee129014
parent2009dcd0494a671e2492aa865e690446388c7a5a (diff)
downloaddabmux-2d48c62d6a4e5d9387e2935dd53ff07357639f0e.tar.gz
dabmux-2d48c62d6a4e5d9387e2935dd53ff07357639f0e.tar.bz2
dabmux-2d48c62d6a4e5d9387e2935dd53ff07357639f0e.zip
Replace 'all rights reserved' by a mention of the licence
The wording 'All rights reserved' no longer has any legal effect in any jurisdiction. It might even be considered contradictory to the terms of the GPL, and is advised against. See the wikipedia entry for 'All rights reserved' for more details.
-rw-r--r--LICENCE4
-rw-r--r--src/utils.cpp6
2 files changed, 7 insertions, 3 deletions
diff --git a/LICENCE b/LICENCE
index d4fa339..9b313b8 100644
--- a/LICENCE
+++ b/LICENCE
@@ -3,8 +3,8 @@ LICENSING
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Her Majesty
the Queen in Right of Canada (Communications Research Center Canada)
-Copyright (C) 2016
-Matthias P. Braendli, http://mpb.li
+Copyright (C) 2017
+Matthias P. Braendli, http://www.opendigitalradio.org
This file is part of ODR-DabMux. ODR-DabMux is a fork of CRC-DabMux,
which was developed by the Communications Research Center Canada.
diff --git a/src/utils.cpp b/src/utils.cpp
index a2db735..cfbe13b 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -5,6 +5,8 @@
Copyright (C) 2017
Matthias P. Braendli, matthias.braendli@mpb.li
+
+ http://www.opendigitalradio.org
*/
/*
This file is part of ODR-DabMux.
@@ -95,10 +97,12 @@ void header_message()
fprintf(stderr,
"Her Majesty the Queen in Right of Canada\n");
fprintf(stderr,
- "(Communications Research Centre Canada) All rights reserved.\n\n");
+ "(Communications Research Centre Canada)\n\n");
fprintf(stderr,
"Copyright (C) 2017 Matthias P. Braendli\n");
fprintf(stderr,
+ "LICENCE: GPLv3+\n\n");
+ fprintf(stderr,
"http://opendigitalradio.org\n\n");
std::cerr << "Input URLs supported:" << std::endl <<