Merge remote-tracking branch 'origin/open734' into open-master

This commit is contained in:
bwyu 2015-02-04 12:24:23 -08:00
commit def47addb3
3 changed files with 3 additions and 1 deletions

View File

@ -103,7 +103,7 @@
{
"key": "items",
"name": "Items",
"glyph": "i",
"glyph": "9",
"description": "Grid of available items.",
"templateUrl": "templates/items/items.html",
"uses": [ "composition" ],

View File

@ -5,6 +5,7 @@
{
"name": "Plot",
"key": "plot",
"glyph": "6",
"templateUrl": "templates/plot.html",
"needs": [ "telemetry" ],
"delegation": true

View File

@ -6,6 +6,7 @@
{
"key": "scrolling",
"name": "Scrolling",
"glyph": "5",
"description": "Scrolling list of data values.",
"templateUrl": "templates/scrolling.html",
"needs": [ "telemetry" ],