Merged the composable_generator branch into the trunk

git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-25 07:18:52 +00:00
parent 5f29a3e134
commit a4a418a679
82 changed files with 5422 additions and 2961 deletions
@@ -1,6 +1,9 @@
+
 #pragma once

-#include <string>
+
+
+

 // tolua_begin
 class cChatColor
@@ -25,6 +28,7 @@ public:
 	static const std::string LightPurple;
 	static const std::string Yellow;
 	static const std::string White;
+ 	static const std::string Funky;

 	static const std::string MakeColor( char a_Color );
 };