# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1462285263 -3600
# Node ID 510fe0e815fdab5f63c0e5e9c7bed371bc25b44b
# Parent  d6cc7d948ae9b05e8465b7dc37cabad0721afc98# Parent  ced5aedb4cda08f5399cf76a49895495ec1c2e90
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r d6cc7d948ae9 -r 510fe0e815fd .gitignore
--- a/.gitignore	Fri Apr 29 20:20:57 2016 +0100
+++ b/.gitignore	Tue May 03 15:21:03 2016 +0100
@@ -9,3 +9,4 @@
 *.toc
 saves/*.xml
 *.DS_STORE
+*.swp