# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1499264550 -3600
# Node ID 5d5542e01fe14fdd41284c065927cc6c7394e72d
# Parent  84be0f28044d2dd9b3e05478532b16ccfdaab6ce# Parent  2eec0c37b4cb7d70265853032c774204694dffab
Merge branch 'vnext'

diff -r 2eec0c37b4cb -r 5d5542e01fe1 index.html
--- a/index.html	Wed Jul 05 15:20:45 2017 +0100
+++ b/index.html	Wed Jul 05 15:22:30 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 2eec0c37b4cb -r 5d5542e01fe1 test.html
--- a/test.html	Wed Jul 05 15:20:45 2017 +0100
+++ b/test.html	Wed Jul 05 15:22:30 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>