svn merge -r39257:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
authorCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 08:35:06 +0000 (08:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 08:35:06 +0000 (08:35 +0000)
commit7cfd8e15bb8fa4aa8095c92373d70f2f571d6358
tree95b1cdcc8e92742c84e1a56b5b4dd653e71d3b8b
parente21ba299d68d4d18995d1010cca7d8badd6e2e9a
parent3758f125fc661ac6b85b1fc711f5ea31d799e85b
svn merge -r39257:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
24 files changed:
release/datafiles/splash.png
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/unit.c
source/blender/editors/datafiles/splash.png.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_outliner/space_outliner.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/python/intern/bpy_operator.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c