Merge pull request #195 from kiswa/master

Merge master to demo
This commit is contained in:
Matthew Ross 2015-06-06 13:08:45 -04:00
commit e1a0d36008

View File

@ -1,3 +1,3 @@
#!/bin/bash
cd ../lib/
java -jar ../build/compiler.jar -W QUIET --js jquery-1.11.2.min.js jquery-ui.min.js jquery.noty.min.js bootstrap.min.js angular.min.js angular-route.min.js angular-sanitize.min.js ng-context-menu.min.js marked.min.js spectrum.js prefixfree.min.js --js_output_file libs.min.js
java -jar ../build/compiler.jar -W QUIET --js jquery-1.11.3.min.js jquery-ui.min.js jquery.noty.min.js bootstrap.min.js angular.min.js angular-route.min.js angular-sanitize.min.js ng-context-menu.min.js marked.min.js spectrum.js prefixfree.min.js --js_output_file libs.min.js