svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 10 May 2011 00:45:06 +0000 (00:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 10 May 2011 00:45:06 +0000 (00:45 +0000)
commit21a9dc8d8bb320212f9a1d823b214424e6d2a244
treec31f3d9eac904af799c97b9c3ba36abae94281a6
parenta6b057eeea846e3053d8adc204ca0721551ee3be
parent14c3714b81b0c264ff8e117f0230330cc0514ed2
svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
intern/ghost/intern/GHOST_SystemX11.cpp
source/blender/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/displist.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_object.c
source/creator/CMakeLists.txt