merge from trunk r37405
authorXiao Xiangquan <xiaoxiangquan@gmail.com>
Wed, 15 Jun 2011 08:28:56 +0000 (08:28 +0000)
committerXiao Xiangquan <xiaoxiangquan@gmail.com>
Wed, 15 Jun 2011 08:28:56 +0000 (08:28 +0000)
commit40981d872f0410caf1870194c8e15ebaed864dea
treeadde4556e99bbc684580f028c1d962369d9f2676
parent68c8aecb465bf0c8e229c50958dc004bde7407b3
parent81946b9138201800e495eb28addf254958feb1a4
merge from trunk r37405
47 files changed:
intern/ghost/intern/GHOST_DisplayManagerNULL.h
intern/ghost/intern/GHOST_SystemNULL.h
intern/ghost/intern/GHOST_WindowNULL.h
release/bin/.blender/fonts/unifont.ttf.gz
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenlib/intern/path_util.c
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/animation/SConscript
source/blender/editors/animation/anim_markers.c
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/armature/SConscript
source/blender/editors/curve/CMakeLists.txt
source/blender/editors/curve/SConscript
source/blender/editors/datafiles/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/SConscript
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/SConscript
source/blender/editors/object/object_add.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/SConscript
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/SConscript
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_graph/SConscript
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_logic/SConscript
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sequencer/SConscript
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/editors/uvedit/SConscript
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp