projects / blender-staging.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0acdcf 6d5cf68)
Merged changes in the trunk up to revision 41387.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Oct 2011 21:38:01 +0000 (21:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Oct 2011 21:38:01 +0000 (21:38 +0000)
1  2 
source/blender/blenkernel/CMakeLists.txt patch | diff1 | diff2 | blob | history
source/blender/blenkernel/SConscript patch | diff1 | diff2 | blob | history
source/blender/makesrna/intern/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc source/blender/blenkernel/SConscript
Simple merge
Repository to test new patches