*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
@@ -165,3 +165,4 @@ void TRINITY_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2);
 void TRINITY_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2);
 void TRINITY_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2);
 #endif
+