ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-20 16:10:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/api-tutorials' into api-toolbar-add-only

Browse Source 
Conflicts:
	src/MCT.js
This commit is contained in:
Victor Woeltjen
2016-07-01 10:10:33 -07:00
parent 370b515c23 14a56ea17e
commit c9c41cdcc8
11 changed files with 438 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MCT.js
View File

@ -4,7 +4,8 @@ define([
'uuid',
'./api/api',
'text!./adapter/templates/edit-object-replacement.html',
'./ui/Dialog'
'./ui/Dialog',
'./api/objects/bundle'
], function (
EventEmitter,
legacyRegistry,