[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, 5 insertions, 5 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a80e46e2473..ddc0d8fc2f8 100644
--- a/contrib/Makefile.am
+++ b/contrib/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/contrib/extractor/Makefile b/contrib/extractor/Makefile
index c326bc25549..55eb35f336a 100644
--- a/contrib/extractor/Makefile
+++ b/contrib/extractor/Makefile
@@ -16,7 +16,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/contrib/vmap_debugger/ModelContainerView.cpp b/contrib/vmap_debugger/ModelContainerView.cpp
index c29666c0bca..fa6b2b40b29 100644
--- a/contrib/vmap_debugger/ModelContainerView.cpp
+++ b/contrib/vmap_debugger/ModelContainerView.cpp
@@ -451,7 +451,7 @@ namespace VMAP
 
     //====================================================================
 
-    Vector3 ModelContainerView::convertPositionToMangosRep(float x, float y, float z) const {
+    Vector3 ModelContainerView::convertPositionToTrinityRep(float x, float y, float z) const {
         float pos[3];
         pos[0] = z;
         pos[1] = x;
@@ -490,7 +490,7 @@ namespace VMAP
 #if 0
             i_App->defaultController.getPosition();
             Vector3 pos = i_App->defaultController.getPosition();
-            Vector3 pos2 = convertPositionToMangosRep(pos.x, pos.y, pos.z);
+            Vector3 pos2 = convertPositionToTrinityRep(pos.x, pos.y, pos.z);
             //Vector3 pos3 = iVMapManager->convertPositionToInternalRep(pos2.x, pos2.y, pos2.z);
             //pos3 = iVMapManager->convertPositionToInternalRep(pos2.x, pos2.y, pos2.z);
 
diff --git a/contrib/vmap_debugger/ModelContainerView.h b/contrib/vmap_debugger/ModelContainerView.h
index 28d992a0c16..ff41f7d1784 100644
--- a/contrib/vmap_debugger/ModelContainerView.h
+++ b/contrib/vmap_debugger/ModelContainerView.h
@@ -51,7 +51,7 @@ namespace VMAP
         bool iPosSent;
         Array<Command> iPrevLoadCommands;
 	private:
-		Vector3 convertPositionToMangosRep(float x, float y, float z) const;
+		Vector3 convertPositionToTrinityRep(float x, float y, float z) const;
 
 	public:
 		ModelContainerView(const G3D::GApp::Settings& settings);