[svn] * Merge Temp dev SVN with Assembla.

* Changes include:
   - Implementation of w12x's Outdoor PvP and Game Event Systems.
   - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
   - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
   - Improved Config cleanup.
   - And many more changes.

--HG--
branch : trunk

4 files changed, 6 insertions, 6 deletions

diff --git a/dep/include/Makefile.am b/dep/include/Makefile.am
index 81e8f2d4178..05b499b79ba 100644
--- a/dep/include/Makefile.am
+++ b/dep/include/Makefile.am
@@ -4,7 +4,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
diff --git a/dep/include/g3dlite/G3D/platform.h b/dep/include/g3dlite/G3D/platform.h
index fed9c7b5324..8950e5b7b55 100644
--- a/dep/include/g3dlite/G3D/platform.h
+++ b/dep/include/g3dlite/G3D/platform.h
@@ -192,7 +192,7 @@
     //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/HTML/_core_Compiler_Reference.asp
     //
 
-#if 0 //ignore that for mangos
+#if 0 //ignore that for Trinity
     // DLL runtime
     #ifndef _DLL
 	    #define _DLL
diff --git a/dep/include/mersennetwister/MersenneTwister.h b/dep/include/mersennetwister/MersenneTwister.h
index 9c6994bdfb4..6b5c4ef3798 100644
--- a/dep/include/mersennetwister/MersenneTwister.h
+++ b/dep/include/mersennetwister/MersenneTwister.h
@@ -118,7 +118,7 @@ public:
 	// Saving and loading generator state
 	void save( uint32* saveArray ) const;  // to array of size SAVE
 	void load( uint32 *const loadArray );  // from such array
-    /* Mangos not use streams for random values output
+    /* Trinity not use streams for random values output
 	friend std::ostream& operator<<( std::ostream& os, const MTRand& mtrand );
 	friend std::istream& operator>>( std::istream& is, MTRand& mtrand );
     */
@@ -350,7 +350,7 @@ inline void MTRand::load( uint32 *const loadArray )
 	pNext = &state[N-left];
 }
 
-/* Mangos not use streams for random values output
+/* Trinity not use streams for random values output
 inline std::ostream& operator<<( std::ostream& os, const MTRand& mtrand )
 {
 	register const MTRand::uint32 *s = mtrand.state;
diff --git a/dep/include/utf8cpp/utf8/core.h b/dep/include/utf8cpp/utf8/core.h
index 538d56bd468..669183fd111 100644
--- a/dep/include/utf8cpp/utf8/core.h
+++ b/dep/include/utf8cpp/utf8/core.h
@@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <iterator>
 
-// use MaNGOS core types
+// use Trinity core types
 #include "Platform/Define.h"
 
 namespace utf8
@@ -39,7 +39,7 @@ namespace utf8
     // You may need to change them to match your system. 
     // These typedefs have the same names as ones from cstdint, or boost/cstdint
 
-    /* use MaNGOS alternatives
+    /* use Trinity alternatives
     typedef unsigned char   uint8_t;
     typedef unsigned short  uint16_t;
     typedef unsigned int    uint32_t;