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://sru.miketaylor.org.uk/?a=commitdiff_plain;h=c1d090e6e656183cdea3dbd88ae851fb1d00374b;hp=1d881c16574d9e54907d7ad857fa4d3524cf3a66;p=mkws-moved-to-github.git Merge remote-tracking branch 'origin/master' into wosch Conflicts: examples/htdocs/index-wolfram.html --- diff --git a/examples/htdocs/index-full.html b/examples/htdocs/index-full.html index 0168239..45d6b7d 100644 --- a/examples/htdocs/index-full.html +++ b/examples/htdocs/index-full.html @@ -11,7 +11,6 @@ lang: "da", debug: 1, use_service_proxy: true, - switch_menu: true, lang_menu: true, sort_default: "relevance", query_width: 50, diff --git a/examples/htdocs/index-lowlevel.html b/examples/htdocs/index-lowlevel.html index 15a453a..4b04393 100644 --- a/examples/htdocs/index-lowlevel.html +++ b/examples/htdocs/index-lowlevel.html @@ -3,9 +3,6 @@ MKWS demo: low-level subcomponents -