Merge branch 'master' into js

Conflicts:
	moonlight.hpp
This commit is contained in:
Cameron Gutman
2016-02-26 23:10:31 -05:00
5 changed files with 50 additions and 30 deletions

View File

@@ -8,7 +8,7 @@
<link rel="stylesheet" href="static/css/material.min.css">
<link rel="stylesheet" href="static/css/style.css">
</head>
<body data-name="moonlight-chrome" data-width="1280" data-height="720" data-tools="pnacl" data-configs="Debug Release" data-path="{tc}/{config}">
<body data-name="moonlight-chrome" data-tools="pnacl" data-configs="Debug Release" data-path="{tc}/{config}">
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">