Tamito Kajiyama 385c72f5f2 Merged changes in the trunk up to revision 55546. ... Conflicts resolved: source/blenderplayer/bad_level_call_stubs/SConscript Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899 to make it easier to merge trunk changes.		2013-03-24 12:13:13 +00:00
..
freestyle	Added header comments to indicate the author(s) of original files.	2013-03-24 00:53:05 +00:00
modules	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +00:00
presets	code cleanup: pep8 & minor changes	2013-03-11 02:19:58 +00:00
startup	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +00:00
templates_osl	OSL Templates: remove unnecessary stdosl.h include.	2012-12-30 10:37:32 +00:00
templates_py	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +00:00