ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 07:38:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Clocks/Timers] Bring in latest

Browse Source 
Merge in latest from master branch to support review of
changes, nasa/openmctweb#207
This commit is contained in:
Victor Woeltjen
2015-10-26 10:42:41 -07:00
parent 8acf01ebdf 4ec243c6fb
commit 20cb2ff239
17 changed files with 564 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test-main.js
View File

@ -45,7 +45,8 @@ require.config({
paths: {
'es6-promise': 'platform/framework/lib/es6-promise-2.0.0.min',
'moment': 'platform/telemetry/lib/moment.min',
'moment-duration-format': 'platform/features/clock/lib/moment-duration-format'
'moment-duration-format': 'platform/features/clock/lib/moment-duration-format',
'uuid': 'platform/commonUI/browse/lib/uuid'
},
shim: {