From f847821ecd0725e9fc94da16ad66c86c66fe2a8d Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Tue, 7 Jun 2016 14:11:11 -0500 Subject: [PATCH] updating --- graph.html | 2 +- header.php | 6 +++--- src/glslCanvas | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graph.html b/graph.html index be13af3..986c038 100644 --- a/graph.html +++ b/graph.html @@ -159,7 +159,7 @@ void main(){\n\ } else { console.log('Try to load a local glslEditor'); - loadjscssfile('src/glslCanvas/build/glslCanvas.min.js', 'js'); + loadjscssfile('src/glslCanvas/build/GlslCanvas.js', 'js'); loadjscssfile('src/glslEditor/build/glslEditor.css', 'css'); loadjscssfile('src/glslEditor/build/glslEditor.js', 'js', init); } diff --git a/header.php b/header.php index 6b46043..094c14e 100644 --- a/header.php +++ b/header.php @@ -46,12 +46,12 @@ '; + '; } else { echo ' - '; + '; } ?> diff --git a/src/glslCanvas b/src/glslCanvas index 4d5e073..254c6ec 160000 --- a/src/glslCanvas +++ b/src/glslCanvas @@ -1 +1 @@ -Subproject commit 4d5e073bf135692178d7cb62b5cc32dac2dae19f +Subproject commit 254c6ec741c9d3f38d822b42d6d1f70091318512