Charles Hacskaylo 4f7ca98b60 Merge branch 'master' into nem468a. ... Many tweaks to fix some issues with tree, labels and Inspector. Conflicts: platform/commonUI/edit/res/templates/elements.html platform/commonUI/general/res/sass/search/_search.scss platform/commonUI/general/res/sass/tree/_tree.scss platform/commonUI/general/res/templates/object-inspector.html platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/snow/res/css/theme-snow.css platform/search/res/templates/search.html		2016-01-11 13:29:26 -08:00
..
lib	[Plugins] Bring over timeline, clock plugins	2015-09-14 16:45:41 -07:00
res/templates	Merged from master	2015-11-25 09:04:11 -08:00
src	Resolved conflict	2016-01-06 14:06:28 -08:00
test	[Licenses] Add license headers	2015-11-05 12:45:51 -08:00
bundle.json	[Edit Mode] Limit context menu options available for objects in edit mode	2015-12-09 18:14:17 -08:00