From: Wolfram Schneider Date: Tue, 18 Mar 2014 09:51:27 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 1.0.0~1314 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=7835a4302a611440bd3be646edbabbbe48cc745a;hp=6bce7bdad808e1b2e5b64da14fee4f5f10d63c08;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws Conflicts: tools/htdocs/mkws-jquery.js --- diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html index 445f8bf..60f68ec 100644 --- a/examples/htdocs/mike.html +++ b/examples/htdocs/mike.html @@ -4,16 +4,19 @@ MKWS demo: Mike's playground + + + -
results will appear here
+ + +