Tamito Kajiyama ac9ec06ec1 Merged changes in the trunk up to revision 54421. ... Conflicts resolved: release/datafiles/startup.blend release/scripts/startup/bl_ui/properties_render.py source/blender/SConscript source/blender/blenloader/intern/readfile.c		2013-02-10 10:17:59 +00:00
..
freestyle	Freestyle Python API improvements - part 2.	2013-02-03 17:01:21 +00:00
modules	Update translation extractor so ternary expressions are not merged.	2013-02-10 07:11:32 +00:00
presets	update themes.	2013-01-29 21:58:07 +00:00
startup	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +00:00
templates_osl	OSL Templates: remove unnecessary stdosl.h include.	2012-12-30 10:37:32 +00:00
templates_py	Fix uilists showing data names translated (reported on bf-translations ML by Satoshi Yamasaki aka yamyam, thanks!).	2013-02-08 16:01:21 +00:00