blender/source
Tamito Kajiyama 556912792a Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
2013-01-26 23:49:13 +00:00
..
blender Merged changes in the trunk up to revision 54110. 2013-01-26 23:49:13 +00:00
blenderplayer Merged changes in the trunk up to revision 54110. 2013-01-26 23:49:13 +00:00
creator Merged changes in the trunk up to revision 54110. 2013-01-26 23:49:13 +00:00
gameengine make bullet optional again 2013-01-23 07:26:39 +00:00
icons Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
tests patch [#33924] Spelling Corrections 2013-01-19 03:04:51 +00:00
CMakeLists.txt remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
SConscript Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00