Merge branch 'master' of https://github.com/nasa/openmctweb into open18

2015-06-25 10:00:21 -07:00
parent 1961ba20c0 25d3a4d8c2
commit c6405c50df
40 changed files with 15228 additions and 632 deletions
--- a/platform/features/plot/src/modes/PlotModeOptions.js
+++ b/platform/features/plot/src/modes/PlotModeOptions.js
@@ -29,7 +29,7 @@ define(
        var STACKED = {
                key: "stacked",
                name: "Stacked",
-                glyph: "8",
+                glyph: "m",
                factory: PlotStackMode
            },
            OVERLAID = {