Merge from trunk -r 24758:25003.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 29 Nov 2009 18:54:37 +0000 (18:54 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 29 Nov 2009 18:54:37 +0000 (18:54 +0000)
1  2 
CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/windowmanager/intern/wm_operators.c

diff --cc CMakeLists.txt
Simple merge
@@@ -2467,7 -2590,9 +2592,8 @@@ void wm_operatortype_init(void
        WM_operatortype_append(WM_OT_redraw_timer);
        WM_operatortype_append(WM_OT_memory_statistics);
        WM_operatortype_append(WM_OT_debug_menu);
+       WM_operatortype_append(WM_OT_splash);
        WM_operatortype_append(WM_OT_search_menu);
 -      WM_operatortype_append(WM_OT_call_menu);
  
  #ifdef WITH_COLLADA
        /* XXX: move these */