From: Wolfram Schneider Date: Fri, 23 Aug 2013 09:19:44 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into wosch X-Git-Tag: 0.9.1~202^2~71 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=c1d090e6e656183cdea3dbd88ae851fb1d00374b Merge remote-tracking branch 'origin/master' into wosch Conflicts: examples/htdocs/index-wolfram.html --- c1d090e6e656183cdea3dbd88ae851fb1d00374b diff --cc examples/htdocs/index-wolfram.html index fccb853,5e7bd2b..545a09d --- a/examples/htdocs/index-wolfram.html +++ b/examples/htdocs/index-wolfram.html @@@ -4,14 -2,34 +4,13 @@@ MKWS demo: Wolfram's playground - +