Tamito Kajiyama 910f04ca63 Merged changes in the trunk up to revision 44221. ... Conflicts resolved: release/datafiles/blender_icons.png source/blender/blenkernel/intern/anim_sys.c source/blender/blenloader/intern/readfile.c		2012-02-18 11:26:11 +00:00
..
buildinfo.c	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
CMakeLists.txt	Merged changes in the trunk up to revision 44221.	2012-02-18 11:26:11 +00:00
creator.c	Merged changes in the trunk up to revision 43585.	2012-01-21 23:01:25 +00:00
SConscript	Shuffle some build code around to ensure debug builds on Windows actually run too.	2011-06-08 11:53:07 +00:00