ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-18 23:28:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[API] Merge in latest from master

Browse Source
This commit is contained in:
Victor Woeltjen
2016-09-29 10:47:52 -07:00
parent 7ce9bd969a 7439d949c4
commit ed8d331cd3
1110 changed files with 11447 additions and 10210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/commonUI/general/bundle.js
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* Open MCT, Copyright (c) 2014-2016, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
* Open MCT is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* Open MCT includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
@ -207,6 +207,7 @@ define([
"implementation": TimeRangeController,
"depends": [
"$scope",
"$timeout",
"formatService",
"DEFAULT_TIME_FORMAT",
"now"
@ -383,7 +384,7 @@ define([
{
"key": "mctTree",
"implementation": MCTTree,
"depends": ['$parse', 'gestureService']
"depends": ['gestureService']
}
],
"constants": [