summaryrefslogtreecommitdiffstats
path: root/Install
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2014-10-11 19:32:21 +0200
committerAlexander Harkness <bearbin@gmail.com>2014-10-11 19:32:21 +0200
commit93833069a80fe4aec33a95148df39ad40671ddaf (patch)
tree2e6a335a60e618b5fe456ca8a586a2c5448c8c87 /Install
parentReverted submodule changes. (diff)
parentMerge pull request #1528 from kjanku1/master (diff)
downloadcuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.gz
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.bz2
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.lz
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.xz
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.zst
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.zip
Diffstat (limited to '')
-rw-r--r--Install/ThirdPartyLicenses/Lua-LICENSE.txt (renamed from Install/Lua-LICENSE.txt)0
-rw-r--r--Install/ThirdPartyLicenses/LuaExpat-license.html (renamed from Install/LuaExpat-license.html)0
-rw-r--r--Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt (renamed from Install/LuaSQLite3-LICENSE.txt)0
-rw-r--r--Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt (renamed from Install/MersenneTwister-LICENSE.txt)0
-rw-r--r--Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt20
-rw-r--r--Install/Zip2008.list6
-rw-r--r--Install/Zip2008_PDBs.list3
7 files changed, 24 insertions, 5 deletions
diff --git a/Install/Lua-LICENSE.txt b/Install/ThirdPartyLicenses/Lua-LICENSE.txt
index 3c6d06fcf..3c6d06fcf 100644
--- a/Install/Lua-LICENSE.txt
+++ b/Install/ThirdPartyLicenses/Lua-LICENSE.txt
diff --git a/Install/LuaExpat-license.html b/Install/ThirdPartyLicenses/LuaExpat-license.html
index bd4a54f9a..bd4a54f9a 100644
--- a/Install/LuaExpat-license.html
+++ b/Install/ThirdPartyLicenses/LuaExpat-license.html
diff --git a/Install/LuaSQLite3-LICENSE.txt b/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt
index cf1014378..cf1014378 100644
--- a/Install/LuaSQLite3-LICENSE.txt
+++ b/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt
diff --git a/Install/MersenneTwister-LICENSE.txt b/Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt
index 5c7a6ef04..5c7a6ef04 100644
--- a/Install/MersenneTwister-LICENSE.txt
+++ b/Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt
diff --git a/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt b/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt
new file mode 100644
index 000000000..ec952abba
--- /dev/null
+++ b/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2012-2014 Sebastien Rombauts (sebastien.rombauts@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
diff --git a/Install/Zip2008.list b/Install/Zip2008.list
index b118ccbf9..e69857d09 100644
--- a/Install/Zip2008.list
+++ b/Install/Zip2008.list
@@ -6,9 +6,7 @@
..\MCServer\furnace.txt
..\MCServer\items.ini
..\MCServer\monsters.ini
+..\MCServer\buildinfo.txt
MCServer*debug.cmd
*.example.ini
-Lua-LICENSE.txt
-LuaExpat-license.html
-LuaSQLite3-LICENSE.txt
-MersenneTwister-LICENSE.txt
+ThirdPartyLicenses
diff --git a/Install/Zip2008_PDBs.list b/Install/Zip2008_PDBs.list
index 608b0185b..96e4cd7d3 100644
--- a/Install/Zip2008_PDBs.list
+++ b/Install/Zip2008_PDBs.list
@@ -1,2 +1,3 @@
MCServer\*.pdb
-src\Bindings\Bindings.* \ No newline at end of file
+MCServer\buildinfo.txt
+src\Bindings\Bindings.*