From: Mike Taylor <mike@indexdata.com>
Date: Wed, 2 Jul 2014 10:46:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~461
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=5e836d7074964d2823b770037162c044ce6d6966;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

5e836d7074964d2823b770037162c044ce6d6966
diff --cc examples/htdocs/mike.html
index 4795d09,1b71a49..655766e
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@@ -3,13 -3,11 +3,13 @@@
      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
      <title>MKWS demo: Orex</title>
      <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
 -    <script type="text/javascript">var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-orexauth" };</script>
 +    <script type="text/javascript">
 +      var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-orexauth" };
 +    </script>
      <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
-     <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
-     <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-     <script type="text/javascript" src="src/pz2.js"></script>
+     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+     <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+     <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
      <script type="text/javascript" src="src/mkws-handlebars.js"></script>
      <script type="text/javascript" src="src/mkws-core.js"></script>
      <script type="text/javascript" src="src/mkws-team.js"></script>