ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-17 14:48:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into subobject-selection-1126

Browse Source 
Conflicts:
	bower.json
	main.js
	test-main.js
This commit is contained in:
Victor Woeltjen
2016-09-14 11:06:05 -07:00
parent fd97f4db41 f73238787d
commit 5e3dcadfa4
114 changed files with 1180 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-main.js
View File

@ -53,8 +53,10 @@ requirejs.config({
"angular": "bower_components/angular/angular.min",
"angular-route": "bower_components/angular-route/angular-route.min",
"csv": "bower_components/comma-separated-values/csv.min",
"es6-promise": "bower_components/es6-promise/promise.min",
"EventEmitter": "bower_components/eventemitter3/index",
"es6-promise": "bower_components/es6-promise/es6-promise.min",
"html2canvas": "bower_components/html2canvas/build/html2canvas.min",
"jsPDF": "bower_components/jspdf/dist/jspdf.min",
"moment": "bower_components/moment/moment",
"moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
"saveAs": "bower_components/FileSaver.js/FileSaver.min",