Campbell Barton 245a9db713 patch [#34687] Patch for AutoMerge button in 3d editor ... from Dan McGrath (dmcgrath)		2013-03-21 17:26:15 +00:00
..
modules	Small changes/additions to i18n tools.	2013-03-19 15:49:53 +00:00
presets	code cleanup: pep8 & minor changes	2013-03-11 02:19:58 +00:00
startup	patch [#34687] Patch for AutoMerge button in 3d editor	2013-03-21 17:26:15 +00:00
templates_osl	OSL Templates: remove unnecessary stdosl.h include.	2012-12-30 10:37:32 +00:00
templates_py	Merge of the PyNodes branch (aka "custom nodes") into trunk.	2013-03-18 16:34:57 +00:00