svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 04:53:57 +0000 (04:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 04:53:57 +0000 (04:53 +0000)
commit226e424cb2cb52edfba0f098a4ac4537fd1db914
treed49d1d0376872d008b7315d7600ceca346cd96bf
parent6f08f18d2708b84cab782b0019149b3cb552dbd7
parent50277c48ba5bf9eae418453159e421489895dafd
svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
22 files changed:
intern/ghost/intern/GHOST_SystemSDL.cpp
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/curve/editfont.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_wm_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c