# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1499264459 -3600
# Node ID 7c21a0db02e9b25232d4b671f03379e72e34df66
# Parent  b2f52634c830421f774b6a91598233b0638bc60a# Parent  84be0f28044d2dd9b3e05478532b16ccfdaab6ce
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r b2f52634c830 -r 7c21a0db02e9 index.html
--- a/index.html	Wed Jul 05 12:22:29 2017 +0100
+++ b/index.html	Wed Jul 05 15:20:59 2017 +0100
@@ -51,7 +51,7 @@
         <button id="popup-previous" class="popupButton">Back</button>
     </div>
     <div class="testHalt" style="visibility: hidden"></div>
-    <div id="footer"><a target="_blank" href="https://github.com/BrechtDeMan/WebAudioEvaluationTool">Web Audio Evaluation Toolbox (v1.2.1)</a></div>
+    <div id="footer"><a target="_blank" href="https://github.com/BrechtDeMan/WebAudioEvaluationTool">Web Audio Evaluation Toolbox (v1.2.2-pre)</a></div>
 </body>
 
 </html>
diff -r b2f52634c830 -r 7c21a0db02e9 test.html
--- a/test.html	Wed Jul 05 12:22:29 2017 +0100
+++ b/test.html	Wed Jul 05 15:20:59 2017 +0100
@@ -37,7 +37,7 @@
         <button id="popup-previous" class="popupButton">Back</button>
     </div>
     <div class="testHalt" style="visibility: hidden"></div>
-    <div id="footer"><a target="_blank" href="https://github.com/BrechtDeMan/WebAudioEvaluationTool">Web Audio Evaluation Toolbox (v1.2.1)</a></div>
+    <div id="footer"><a target="_blank" href="https://github.com/BrechtDeMan/WebAudioEvaluationTool">Web Audio Evaluation Toolbox (v1.2.2-pre)</a></div>
 </body>
 
 </html>