Tamito Kajiyama 94ae0232b0 Merged changes in the trunk up to revision 53729. ... Conflicts resolved: release/datafiles/startup.blend source/blender/blenloader/intern/readfile.c		2013-01-12 02:02:53 +00:00
..
freestyle	New command-line option --debug-freestyle to enable verbose debug messages	2013-01-03 23:27:20 +00:00
modules	Adding Uzbek language	2013-01-04 18:19:07 +00:00
presets	update themes	2012-12-16 05:48:27 +00:00
startup	Merged changes in the trunk up to revision 53729.	2013-01-12 02:02:53 +00:00
templates_osl	OSL Templates: remove unnecessary stdosl.h include.	2012-12-30 10:37:32 +00:00
templates_py	Adding some example for new UIList...	2013-01-05 11:14:35 +00:00