svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 05:35:19 +0000 (05:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 05:35:19 +0000 (05:35 +0000)
commit191ad54599b2d8c8677f56870ee1800e62c50137
treeb1670620b466e1f865929cb6b1de16650f9510b7
parent521d824371f6b62b09bc8fa9693c3429a14d1d77
parent910220be47729d6effffb7aa33bfe05d4caa5d3d
svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender
13 files changed:
intern/ghost/intern/GHOST_SystemWin32.h
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenloader/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_windowmanager_types.h
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt