*Merge.

--HG-- branch : trunk
2009-02-18 11:36:19 -06:00
parent 017f309b5b 7bff1c1d60
commit 31637d4aac
2384 changed files with 9729 additions and 969 deletions
@@ -61,3 +61,4 @@
 #  pragma warning( disable : 4786 )                         // identifier was truncated to '255' characters in the debug information
 #endif
 #endif
+
@@ -123,3 +123,4 @@ typedef uint32      DWORD;
 typedef uint64 OBJECT_HANDLE;

 #endif //TRINITY_DEFINE_H
+