Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
003ab20292924b829a20ec852188e0e18154f3ef
blender/source/creator
History
Tamito Kajiyama 003ab20292 Merged changes in the trunk up to revision 35618. 
Conflicts resolved:
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_main_api.c
2011-03-19 00:05:30 +00:00
..
buildinfo.c
fix #if errors, add defined() in proper places
2011-02-25 10:01:33 +00:00
CMakeLists.txt
Merged changes in the trunk up to revision 35618.
2011-03-19 00:05:30 +00:00
creator.c
Merged changes in the trunk up to revision 35618.
2011-03-19 00:05:30 +00:00
SConscript
Merged changes in the trunk up to revision 32886.
2010-11-05 21:49:36 +00:00