Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-02-20 03:12:20 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-02-20 03:13:38 +0300
commit3b2a169f463bb3e83d8787951dd0639e12f12306 (patch)
tree94b4208e2f5c31683d3fba6f9364d598b8db24c8 /LICENSE
parent0840dd4578029c93810cc0369b4bd23188647916 (diff)
Simplify LICENSE file, add LICENSE.header and add AUTHORS.
This simplifies the LICENSE file refer to the copyright holders of Mumble as "The Mumble Developers". The client already does this in the About dialog. The entity "The Mumble Developers" is the name we use for the copyright holders of Mumble. These are listed in the AUTHORS file. The AUTHORS file is generated via scripts/generate-AUTHORS.py. The script looks at the Git history and removes duplicates and other mistakes made through the years. All new files in the repo should use the license header found in LICENSE.header. The AUTHORS and LICENSE files are permalinked to https://www.mumble.info/LICENSE https://www.mumble.info/AUTHORS These locations are used in the files themselves, as well as the license header.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE21
1 files changed, 9 insertions, 12 deletions
diff --git a/LICENSE b/LICENSE
index c74a84d9f..a98ba138b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,8 @@
-Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
-Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net>
-Copyright (C) 2007, Sebastian Schlingmann <mit_service@users.sourceforge.net>
-Copyright (C) 2007, Trenton Schulz
-Copyright (C) 2008-2016, Mikkel Krautz <mikkel@krautz.dk>
-Copyright (C) 2008, Andreas Messer <andi@bupfen.de>
-Copyright (C) 2008-2016, Stefan Hacker <dd0t@users.sourceforge.net>
-Copyright (C) 2008-2011, Snares <snares@users.sourceforge.net>
-Copyright (C) 2009-2013, Benjamin Jemlich <pcgod@users.sourceforge.net>
-Copyright (C) 2009-2016, Kissaki <kissaki@gmx.de>
-Copyright (C) 2010-2016, Jamie Fraser <jamie.f@mumbledog.com>
+Copyright (C) 2005-2016 The Mumble Developers
+
+A list of The Mumble Developers can be found in the
+AUTHORS file at the root of the Mumble source tree
+or at <https://www.mumble.info/AUTHORS>.
All rights reserved.
@@ -21,7 +15,7 @@ are met:
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-- Neither the name of the Mumble Developers nor the names of its
+- Neither the name of The Mumble Developers nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
@@ -36,3 +30,6 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+For questions and inquiries about Mumble's license,
+please contact <license@mumble.info>.