Mercurial > hg > webaudioevaluationtool
view docs/AESPosterComp/AESposter.pdf @ 3083:2b550d4c7fde
Merge branch 'vnext' into Dev_main
# Conflicts:
# tests/examples/APE_example.xml
# tests/examples/horizontal_example.xml
# tests/examples/mushra_example.xml
# tests/examples/radio_example.xml
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Wed, 22 Nov 2017 10:10:44 +0000 |
parents | 4e0504f39c87 |
children |