Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644 (file)
index 0000000..f2fc3f4
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1 @@
+mkws-templates.js

diff --git a/test/bin/yui-compressor b/test/bin/yui-compressor
new file mode 100755 (executable)
index 0000000..e794534
--- /dev/null
+++ b/test/bin/yui-compressor
@@ -0,0 +1,6 @@
+#!/bin/sh
+# 
+# yui-compressor - dummy wrapper for missing java tool yui-compressor
+
+cat "$@"
+

diff --git a/tools/htdocs/.gitignore b/tools/htdocs/.gitignore
index b31bd88..69d2713 100644 (file)
--- a/tools/htdocs/.gitignore
+++ b/tools/htdocs/.gitignore
@@ -1,7 +1,7 @@
 NEWS
 README.html
 VERSION
-handlebars-v1.1.2.js
+handlebars-v1.3.0.js
 jquery-1.10.0.min.js
 jquery.json-2.4.js
 mkws-complete.js