changeset 1935:c1fca6c94c36

Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Wed, 06 Apr 2016 14:20:55 +0100
parents 298474dc815f (current diff) 477035fea354 (diff)
children 1c7a2e87c928
files
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CITING.txt	Sat Apr 02 13:20:58 2016 +0100
+++ b/CITING.txt	Wed Apr 06 14:20:55 2016 +0100
@@ -3,7 +3,7 @@
 Nicholas Jillings, Brecht De Man, David Moffat and Joshua D. Reiss, "Web Audio Evaluation Tool: A Browser-Based Listening Test Environment," 12th Sound and Music Computing Conference, July 2015.
 
 BibTeX: 
-@conference{deman2015c,
+@conference{waet2015,
 	Author = {Jillings, Nicholas and Moffat, David and De Man, Brecht and Reiss, Joshua D.},
 	Booktitle = {12th Sound and Music Computing Conference},
 	Month = {July},
@@ -16,4 +16,5 @@
 nicholas.jillings@mail.bcu.ac.uk
 b.deman@qmul.ac.uk
 d.j.moffat@qmul.ac.uk
-joshua.reiss@qmul.ac.uk
\ No newline at end of file
+joshua.reiss@qmul.ac.uk
+ryan.stables@bcu.ac.uk
--- a/README.md	Sat Apr 02 13:20:58 2016 +0100
+++ b/README.md	Wed Apr 06 14:20:55 2016 +0100
@@ -18,9 +18,20 @@
 
 ## Academic use
 
-Please refer to CITING.txt.
+Please cite 
+
+> Nicholas Jillings, Brecht De Man, David Moffat and Joshua D. Reiss, "[Web Audio Evaluation Tool: A Browser-Based Listening Test Environment](http://www.brechtdeman.com/publications/smc10.pdf)," [12th Sound and Music Computing Conference](http://www.maynoothuniversity.ie/smc15/), July 2015.
+
+BibTeX: 
+
+    @conference{waet2015,
+    	Author = {Jillings, Nicholas and Moffat, David and De Man, Brecht and Reiss, Joshua D.},
+	    Booktitle = {12th Sound and Music Computing Conference},
+	    Month = {July},
+	    Title = {Web {A}udio {E}valuation {T}ool: {A} browser-based listening test environment},
+    	Year = {2015}}
 
 
 ## Other use
 
-Please refer to LICENSE.txt (GNU GENERAL PUBLIC LICENSE).
+Please refer to LICENSE.txt ([GNU General Public License](http://www.gnu.org/licenses/gpl-3.0.en.html)).