Permalink
Browse files

fix master server linux makefile, update LICENSE

  • Loading branch information...
1 parent 6c5971e commit 7c3edf8ba63e0ff653fe10f9c3a07aa4fbcea988 @foxtacles committed Jul 26, 2014
Showing with 379 additions and 357 deletions.
  1. +8 −8 LICENSE
  2. +25 −0 source/lib/RakNet/LICENSE
  3. +0 −349 source/vaultmaster/makefile
  4. +346 −0 source/vaultmaster/makefile.unix
View
@@ -2,12 +2,12 @@ The following license (MIT License) applies to all files in this repository, exc
[1] source/ufmod.obj
[2] source/ufmod.h
[3] source/the_wasteland.xm
- [4] source/stack_trace
- [5] source/RakNet
- [6] source/iniparser
- [7] source/vaultserver/amx
- [8] source/vaultserver/time
- [9] source/vaultserver/sqlite
+ [4] source/lib/stack_trace
+ [5] source/lib/RakNet
+ [6] source/lib/iniparser
+ [7] source/lib/amx
+ [8] source/lib/time
+ [9] source/lib/sqlite
[10] source/vaultgui
[11] source/deps/exchndl.dll
[12] source/deps/fose_1_7_vmp.dll
@@ -18,7 +18,7 @@ which fall under different licenses:
[2] unknown license, open-source / freely available
[3] unknown license, freely available
[4] Boost Software License, Version 1.0
- [5] RakNet Indy License, Version 1.03 (granted to Christan Semmler, csemmler.goe@googlemail.com)
+ [5] BSD License For RakNet software
[6] MIT License
[7] Apache License, Version 2.0
[8] MIT License
@@ -28,7 +28,7 @@ which fall under different licenses:
[12] unknown license / open-source
[13] unknown license / freely available
-Copyright (c) 2010 - 2013 Christian Semmler
+Copyright (c) 2010 - 2014 Christian Semmler
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:
@@ -0,0 +1,25 @@
+BSD License
+For RakNet software
+
+Copyright (c) 2014, Oculus VR, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+* 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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 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.
Oops, something went wrong.

0 comments on commit 7c3edf8

Please sign in to comment.