changeset 2328:510fe0e815fd

Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Tue, 03 May 2016 15:21:03 +0100
parents d6cc7d948ae9 (current diff) ced5aedb4cda (diff)
children fc8d79f8d9c5
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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