Aaron Carlisle 661a05de23 Fix error in previous merge		2017-07-21 18:32:27 -04:00
..
addons@371960484a	Layers: move SceneCollection	2017-03-08 23:35:54 +01:00
addons_contrib@a8515cfdfe	Fix blurry icons	2017-01-29 17:21:57 +03:00
freestyle	PYAPI: Fix freestyle submodules without tocrees	2017-06-14 14:42:44 -04:00
modules	Merge branch 'master' into blender2.8	2017-06-29 10:11:17 +02:00
presets	Merge branch 'master' into blender2.8	2017-07-11 12:30:30 +02:00
startup	Fix error in previous merge	2017-07-21 18:32:27 -04:00
templates_osl	Cycles: Remove Westin closure.	2014-10-03 16:03:49 +02:00
templates_py	Manipulator: split alpha out of color property	2017-07-17 15:06:18 +10:00