openmct/platform
Victor Woeltjen 970698c77b Merge remote-tracking branch 'nasa/open1392' into open1392b
Conflicts:
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
2015-06-29 16:09:01 -07:00
..
commonUI Merge remote-tracking branch 'nasa/open1392' into open1392b 2015-06-29 16:09:01 -07:00
containment [Composition] Disallow composition for leaf types 2015-06-04 09:16:12 -07:00
core Merge remote-tracking branch 'origin/open1223' into open-1338 2015-06-29 12:08:16 -07:00
data [Structure] Add platform structure 2014-10-27 18:18:50 -07:00
entanglement [Glyphs] Use placeholder glyphs for actions 2015-06-12 10:27:35 -07:00
execution [Workers] Add example worker 2015-06-18 11:21:00 -07:00
features Merge pull request #30 from slhale/open26 2015-06-29 15:42:33 -07:00
forms Merge branch 'open-master' into open1272 2015-06-19 13:16:33 -07:00
framework [Licenses] Add missing copyright/license info 2015-05-29 10:05:59 -07:00
identity [Structure] Add platform structure 2014-10-27 18:18:50 -07:00
persistence [Drag-Drop] Prevent redundant drops 2015-06-25 11:27:58 -07:00
policy [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
representation Merge branch 'open-master' into open1256 2015-06-23 13:14:17 -07:00
telemetry Merge remote-tracking branch 'origin/open1223' into open-1338 2015-06-29 12:08:16 -07:00
README.md [Structure] Add platform structure 2014-10-27 18:18:50 -07:00

This directory contains all bundles for the Open MCT Web platform, as well as the framework which runs them.