svn merge -r39286:39298 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 09:28:07 +0000 (09:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 09:28:07 +0000 (09:28 +0000)
commit2c2fa877be6a1e7f6f1abbb131d3706948368248
treefed2eaf68bf43edf399de836aa8c44624d3c2517
parent78f89c3bbf6c7faa3b364f75f7fd52d9f62762e6
parent99caa9470e9dc420541dc49c29037f6bac55964e
svn merge -r39286:39298 https://svn.blender.org/svnroot/bf-blender/trunk/blender, ensure some edits in trunk dont get merged back into pepper
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner_draw.c
source/blenderplayer/bad_level_call_stubs/stubs.c