• R/O
  • SSH

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).


Commit MetaInfo

修訂7ead8df7bfbbb8b60ea237b721a70f189885bf04 (tree)
時間2012-08-23 04:28:17
作者Benjamin Berkels <torr.samaho@quan...>
CommiterBenjamin Berkels

Log Message

moved Skulltag's license to the docs directory and added a Zandronum license that is almost identical to Skulltag's license

Change Summary

差異

diff -r c75c3b218fd5 -r 7ead8df7bfbb LICENSE.txt
--- a/LICENSE.txt Sun Aug 19 22:11:18 2012 +0200
+++ b/LICENSE.txt Wed Aug 22 21:28:17 2012 +0200
@@ -1,6 +1,5 @@
1-Skulltag - The Next Level of Doom
2-Copyright (c) 2000-2007, Brad Carney
3-Copyright (c) 2007-2012, Skulltag Development Team
1+Zandronum
2+Copyright (c) 2012, Zandronum Development Team
43 All rights reserved.
54
65 Redistribution and use in source and binary forms, with or without
@@ -11,7 +10,7 @@
1110 2. Redistributions in binary form must reproduce the above copyright notice,
1211 this list of conditions and the following disclaimer in the documentation
1312 and/or other materials provided with the distribution.
14-3. Neither the name of the Skulltag Development Team nor the names of its
13+3. Neither the name of the Zandronum Development Team nor the names of its
1514 contributors may be used to endorse or promote products derived from this
1615 software without specific prior written permission.
1716 4. Redistributions in any form must be accompanied by information on how to
@@ -35,6 +34,6 @@
3534 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3635 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3736
38-The above copyright and license notice applies to distributions of Skulltag in
37+The above copyright and license notice applies to distributions of Zandronum in
3938 source and binary form. Some source files contain additional notices of
4039 original copyright by their contributors; see each source for details.
\ No newline at end of file
diff -r c75c3b218fd5 -r 7ead8df7bfbb docs/Skulltag-license.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/Skulltag-license.txt Wed Aug 22 21:28:17 2012 +0200
@@ -0,0 +1,40 @@
1+Skulltag - The Next Level of Doom
2+Copyright (c) 2000-2007, Brad Carney
3+Copyright (c) 2007-2012, Skulltag Development Team
4+All rights reserved.
5+
6+Redistribution and use in source and binary forms, with or without
7+modification, are permitted provided that the following conditions are met:
8+
9+1. Redistributions of source code must retain the above copyright notice, this
10+ list of conditions and the following disclaimer.
11+2. Redistributions in binary form must reproduce the above copyright notice,
12+ this list of conditions and the following disclaimer in the documentation
13+ and/or other materials provided with the distribution.
14+3. Neither the name of the Skulltag Development Team nor the names of its
15+ contributors may be used to endorse or promote products derived from this
16+ software without specific prior written permission.
17+4. Redistributions in any form must be accompanied by information on how to
18+ obtain complete source code for the software and any accompanying software
19+ that uses the software. The source code must either be included in the
20+ distribution or be available for no more than the cost of distribution plus
21+ a nominal fee, and must be freely redistributable under reasonable
22+ conditions. For an executable file, complete source code means the source
23+ code for all modules it contains. It does not include source code for
24+ modules or files that typically accompany the major components of the
25+ operating system on which the executable file runs.
26+
27+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
28+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
29+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
30+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
31+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
32+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
33+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
34+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
35+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
36+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37+
38+The above copyright and license notice applies to distributions of Skulltag in
39+source and binary form. Some source files contain additional notices of
40+original copyright by their contributors; see each source for details.
\ No newline at end of file