From: Wolfram Schneider Date: Thu, 20 Jun 2013 11:45:34 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch X-Git-Tag: 0.9.1~575 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=01d95c59750f32341a720843030e3c44b264f8e1;hp=12e6e4a1d1b5067ef0935d4db08b1946cca7e263;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into wosch Conflicts: experiments/spclient/mkws.js --- diff --git a/experiments/spdemo/index.html b/experiments/spdemo/index.html index 0954f03..d8543da 100644 --- a/experiments/spdemo/index.html +++ b/experiments/spdemo/index.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + Pazpar2 demo client @@ -19,16 +19,30 @@ - +
@@ -45,7 +59,7 @@ | Target Info
- +
@@ -62,7 +76,7 @@
- +
@@ -79,7 +93,7 @@ - and show + and show
- + - +