From: Jason Skomorowski <jason@indexdata.com>
Date: Tue, 23 Sep 2014 11:50:01 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~324^2~17
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=f2f6d37825eae7675aecd22293836f95ae22a593;hp=8cdcd4a750fd0903efcf5b52dfe06c7a25336b3f

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

diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
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
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
--- 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