Tamito Kajiyama 556912792a Merged changes in the trunk up to revision 54110. ... Conflicts resolved: source/blender/blenfont/SConscript source/blender/blenkernel/intern/subsurf_ccg.c source/blender/makesdna/intern/makesdna.c source/blender/makesrna/intern/rna_scene.c		2013-01-26 23:49:13 +00:00
..
freestyle	Fix for Stroke.Resample(float iSampling) and Stroke.UpdateLength() using	2013-01-22 01:46:16 +00:00
modules	fix [#29950] Linked proxy armature object properties can't be edited	2013-01-23 06:09:53 +00:00
presets	Added gsoc-2012 collada improvements from bratwurst branch	2013-01-21 13:45:49 +00:00
startup	Merged changes in the trunk up to revision 54110.	2013-01-26 23:49:13 +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