Merge branch 'master' into Psigio-3375

This commit is contained in:
Bryan Housel
2016-12-14 11:30:53 -05:00
250 changed files with 19027 additions and 4204 deletions
+1 -1
View File
@@ -91,7 +91,7 @@
<script src='spec/presets/category.js'></script>
<script src='spec/presets/collection.js'></script>
<script src='spec/presets/init.js'></script>
<script src='spec/presets/index.js'></script>
<script src='spec/presets/preset.js'></script>
<script src='spec/renderer/background_source.js'></script>