changeset 1249:ba6b9e1aaef5

Merge
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Thu, 10 Mar 2016 17:08:10 +0000
parents fbdfdcc07f3a (current diff) f04d8ababef7 (diff)
children 31d2390b25a6
files CITING.txt README.txt core.js docs/AESPosterComp/AESposter.tex docs/AESPosterComp/img/APE.png docs/AESPosterComp/img/MUSHRA.png docs/AESPosterComp/sections/analysis.tex docs/AESPosterComp/sections/footer.tex docs/AESPosterComp/sections/header.tex docs/AESPosterComp/sections/infrastructure.tex docs/AESPosterComp/sections/interfaces.tex docs/AESPosterComp/sections/intro.tex docs/AESPosterComp/sections/testcreate.tex docs/WAC2016/WAC2016.bib docs/WAC2016/WAC2016.pdf docs/WAC2016/WAC2016.tex docs/WAC2016/sig-alternate.cls docs/WAC2016/waccopyright.sty example_eval/AB_example.xml example_eval/mushra_example.xml example_eval/project.xml interfaces/AB.js interfaces/ape.css interfaces/ape.js interfaces/discrete.js interfaces/horizontal-sliders.js interfaces/mushra.js keygen.php pythonServer.py save.php test-schema.xsd test_create/style.css test_create/test_create.html
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff