Merge branch 'master' into open638_rebase

This commit is contained in:
Pete Richards
2016-03-01 10:48:53 -08:00
86 changed files with 2207 additions and 557 deletions

View File

@ -26,12 +26,14 @@ define([
"./src/PlotController",
"./src/policies/PlotViewPolicy",
"./src/PlotOptionsController",
"text!./res/templates/plot.html",
'legacyRegistry'
], function (
MCTChart,
PlotController,
PlotViewPolicy,
PlotOptionsController,
plotTemplate,
legacyRegistry
) {
"use strict";
@ -44,7 +46,7 @@ define([
"name": "Plot",
"key": "plot",
"glyph": "6",
"templateUrl": "templates/plot.html",
"template": plotTemplate,
"needs": [
"telemetry"
],