From: Wolfram Schneider Date: Fri, 23 Aug 2013 14:19:45 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into wosch X-Git-Tag: 0.9.1~202^2~56 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=f10b37e0b60e7b085810d1fdfae2262c3976299e;hp=0689574b8d0579dd869bf4d80b98c62134f7a99b;p=mkws-moved-to-github.git Merge remote-tracking branch 'origin/master' into wosch --- diff --git a/Makefile b/Makefile index 1b1fe3b..26c0ca4 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,10 @@ clean distclean all pz2api-git-checkout: ${MAKE} -C./tools/htdocs $@ +check-js: + ${MAKE} -C./test check + check: distclean all help: - @echo "make [ all | clean | pz2api-git-checkout ]" + @echo "make [ all | clean | pz2api-git-checkout | check-js ]" diff --git a/examples/htdocs/index-jasmine.html b/examples/htdocs/index-jasmine.html new file mode 100644 index 0000000..eb55a46 --- /dev/null +++ b/examples/htdocs/index-jasmine.html @@ -0,0 +1,121 @@ + + + + MKWS demo: Wolfram's playground + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + diff --git a/examples/htdocs/index-wolfram.html b/examples/htdocs/index-wolfram.html index 5e7bd2b..545a09d 100644 --- a/examples/htdocs/index-wolfram.html +++ b/examples/htdocs/index-wolfram.html @@ -1,40 +1,21 @@ + + MKWS demo: Wolfram's playground - + - - + +