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
..
res/templates	Merged from master	2015-11-25 09:04:11 -08:00
src	[Performance] Only invoke apply on size changes	2015-12-03 13:28:32 -08:00
test	Merge remote-tracking branch 'github/master' into open116	2015-12-30 10:15:05 -08:00
bundle.json	Moved gesture from individual views up to browse-object.html for now to resolve #423	2015-12-11 16:42:05 -08:00