svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 03:14:16 +0000 (03:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 03:14:16 +0000 (03:14 +0000)
commitac2dd4099167d9ab6306f3fcb83610a5d01ffae1
tree172d59b04419d821003482e6e5d048c58833974a
parent794f3291fed5f85f8057a49683acdcb80edb0a02
parentb028cba0e4878b5034b96772aba85abc9f669a12
svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blender
12 files changed:
intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
intern/ghost/intern/GHOST_DisplayManagerSDL.h
intern/ghost/intern/GHOST_SystemSDL.cpp
intern/ghost/intern/GHOST_SystemSDL.h
intern/ghost/intern/GHOST_WindowSDL.cpp
intern/ghost/intern/GHOST_WindowSDL.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/smoke.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/render/SConscript