Merge from trunk -r 23968:24181.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Mon, 2 Nov 2009 16:41:57 +0000 (16:41 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Mon, 2 Nov 2009 16:41:57 +0000 (16:41 +0000)
1  2 
CMakeLists.txt
release/scripts/ui/space_info.py
source/blender/editors/include/ED_object.h
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt
tools/Blender.py
tools/btools.py

diff --cc CMakeLists.txt
Simple merge
Simple merge
@@@ -2278,15 -2244,9 +2345,16 @@@ void wm_operatortype_init(void
        WM_operatortype_append(WM_OT_save_as_mainfile);
        WM_operatortype_append(WM_OT_save_mainfile);
        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_search_menu);
 +
 +#ifdef WITH_COLLADA
 +      /* XXX: move these */
 +      WM_operatortype_append(WM_OT_collada_export);
 +      WM_operatortype_append(WM_OT_collada_import);
 +#endif
 +
        WM_operatortype_append(WM_OT_call_menu);
  }
  
Simple merge
Simple merge
diff --cc tools/btools.py
Simple merge