From: Mike Taylor <mike@indexdata.com>
Date: Thu, 9 Oct 2014 11:51:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~277
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=54a6bb8b88e2cc2346d8bd0d4ef1e2ba44e3b069;hp=72a12ca81639ee60795bbf1c83fd23e7d37d2983;p=mkws-moved-to-github.git

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

diff --git a/tools/htdocs/.gitignore b/tools/htdocs/.gitignore
index 69d2713..b1a2151 100644
--- a/tools/htdocs/.gitignore
+++ b/tools/htdocs/.gitignore
@@ -1,7 +1,7 @@
 NEWS
 README.html
 VERSION
-handlebars-v1.3.0.js
+handlebars-v2.0.0.js
 jquery-1.10.0.min.js
 jquery.json-2.4.js
 mkws-complete.js
diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index b168496..c08f23c 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -22,8 +22,6 @@ COMPONENTS = ${SRC}/mkws-handlebars.js \
 	${SRC}/mkws-core.js \
 	${SRC}/mkws-team.js \
 	${SRC}/mkws-filter.js \
-	${SRC}/mkws-templates.js \
-	${SRC}/mkws-popup.js \
 	${SRC}/mkws-widget.js \
 	${SRC}/mkws-widget-main.js \
 	${SRC}/mkws-widget-termlists.js \
@@ -32,7 +30,9 @@ COMPONENTS = ${SRC}/mkws-handlebars.js \
 	${SRC}/mkws-widget-log.js \
 	${SRC}/mkws-widget-record.js \
 	${SRC}/mkws-widget-reference.js \
-	${SRC}/mkws-widget-builder.js
+	${SRC}/mkws-widget-builder.js \
+	${SRC}/mkws-templates.js \
+	${SRC}/mkws-popup.js
 
 GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
 	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js ${SRC}/mkws-templates.js