Tamito Kajiyama c1ceab1281 Merged changes in the trunk up to revision 55357. ... Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool.		2013-03-18 00:48:59 +00:00
..
freestyle	Fix for the Selection by Image Border not taking account of resolution percentage.	2013-03-15 00:30:20 +00:00
modules	Fix more UI i18n issues (reported by Leon Cheung).	2013-03-11 15:01:03 +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 55357.	2013-03-18 00:48:59 +00:00
templates_osl	OSL Templates: remove unnecessary stdosl.h include.	2012-12-30 10:37:32 +00:00
templates_py	Missed instance of ThemeGeneric.back -> ThemeGradient.gradients.high_gradient	2013-02-23 12:55:19 +00:00