Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00
parent 4fd7eb1c2d
commit a1af978b1c
1214 changed files with 92715 additions and 47341 deletions
--- a/source/kernel/gen_system/SYS_SingletonSystem.cpp
+++ b/source/kernel/gen_system/SYS_SingletonSystem.cpp
@@ -95,6 +95,6 @@ void SYS_SingletonSystem::SYS_WriteCommandLineString(const char *paramname, cons
 	m_string_commandlineparms.insert(paramname, value);
 }

-SYS_SingletonSystem::SYS_SingletonSystem() : m_soundfilecache(NULL)
+SYS_SingletonSystem::SYS_SingletonSystem()
 {
 }