openmct

mirror of https://github.com/nasa/openmct.git synced 2025-02-07 19:40:28 +00:00

History

Victor Woeltjen 0036974c60 Merge remote-tracking branch 'github/master' into open450b

Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json

2016-01-08 15:36:10 -08:00

commonUI

Merge remote-tracking branch 'github/master' into open450b

2016-01-08 15:36:10 -08:00

containment

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

core

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

data

[Structure] Add platform structure

2014-10-27 18:18:50 -07:00

entanglement

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

execution

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

features

Merge remote-tracking branch 'github/master' into open450b

2016-01-08 15:36:10 -08:00

forms

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

framework

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

identity

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

persistence

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

policy

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

representation

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

status

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

telemetry

Merge remote-tracking branch 'github/master' into open450b

2016-01-08 15:36:10 -08:00

README.md

[Structure] Add platform structure

2014-10-27 18:18:50 -07:00

README.md

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