projects / blender.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e773075 4b1a8d6)
svn merge -r40051:40075 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Sep 2011 15:25:15 +0000 (15:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Sep 2011 15:25:15 +0000 (15:25 +0000)
1  2 
source/blender/editors/screen/screen_ops.c patch | diff1 | diff2 | blob | history
source/blender/makesrna/RNA_access.h patch | diff1 | diff2 | blob | history

diff --cc source/blender/makesrna/RNA_access.h
Simple merge
The official Blender Foundation tree