Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146. ... Conflicts resolved: release/datafiles/startup.blend source/blender/blenkernel/CMakeLists.txt source/blender/blenlib/intern/bpath.c source/blender/blenloader/intern/readfile.c		2012-12-19 01:49:58 +00:00
..
config	Minor tweaks to some UI messages...	2012-12-17 20:16:37 +00:00
tools	Merged changes in the trunk up to revision 52815.	2012-12-08 12:35:14 +00:00