svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
authorNathan Letwory <nathan@letworyinteractive.com>
Thu, 21 Jul 2011 09:40:59 +0000 (09:40 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Thu, 21 Jul 2011 09:40:59 +0000 (09:40 +0000)
commiteea7c358c7d606f9a4df8f11d42ac5b0df28a6d4
tree32c72886e2007dad65c71b89c90dee891c08e5c3
parentc89379e7e15aeb50a7d7106218821a17e5a7dac9
parent314fdb941e28d5f1fbe2acace6133d6216f4e36c
svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
18 files changed:
CMakeLists.txt
build_files/scons/config/linux2-config.py
intern/ghost/CMakeLists.txt
intern/ghost/GHOST_Types.h
intern/ghost/SConscript
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/object/object_bake.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c