# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1462879266 -3600
# Node ID eae8aebb8214ebc5e520d5f91607a9b5483cd8a3
# Parent  98033840992d9a25a680fc5be89d8a5bfa933fcd# Parent  170b024563abd1af900d17d13646f90dd3251493
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 98033840992d -r eae8aebb8214 .gitignore
--- a/.gitignore	Wed May 04 18:20:55 2016 +0100
+++ b/.gitignore	Tue May 10 12:21:06 2016 +0100
@@ -10,3 +10,4 @@
 saves/*.xml
 *.DS_STORE
 *.swp
+*.swo