openmct/platform/features
Victor Woeltjen dbf196e014 Merge remote-tracking branch 'github/master' into open477
Resolve conflicts to complete merge of #477

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
2016-01-27 12:53:46 -08:00
..
clock Merged from Master 2016-01-14 17:23:53 -08:00
conductor [New Edit Mode] Fixed failing Time Conductor Test 2016-01-14 19:57:06 -08:00
events Regenerated bundles 2016-01-14 17:08:19 -08:00
imagery Merged from Master 2016-01-14 17:23:53 -08:00
layout Merged from Master 2016-01-14 17:23:53 -08:00
pages Merged from Master 2016-01-14 17:23:53 -08:00
plot Merge remote-tracking branch 'github/master' into open477 2016-01-27 12:53:46 -08:00
rtevents Regenerated bundles 2016-01-14 17:08:19 -08:00
rtscrolling Regenerated bundles 2016-01-14 17:08:19 -08:00
scrolling Merged from Master 2016-01-14 17:23:53 -08:00
static-markup Regenerated bundles 2016-01-14 17:08:19 -08:00
timeline Merged from Master 2016-01-14 17:23:53 -08:00
README.md [Structure] Add platform structure 2014-10-27 18:18:50 -07:00

This directory contains bundles which represent specific user-facing features of Open MCT Web, such as plots and other visualizations. Bundles in this directory should be effectively optional.