# HG changeset patch
# User Becky Stewart <rebecca.stewart@eecs.qmul.ac.uk>
# Date 1297961331 0
# Node ID 972eb5fdb79be8f1373df38bd1b4fb6795023151
# Parent  36e3faa5e9d44df63436b8e28c714e5a8ced5b55# Parent  f4009fe6e302126f7f5b067dfcbdd936df0b1775
Merge.

diff -r 36e3faa5e9d4 -r 972eb5fdb79b Ableton Project/Ableton.als
Binary file Ableton Project/Ableton.als has changed
diff -r 36e3faa5e9d4 -r 972eb5fdb79b Ableton Project/osc_input.amxd
Binary file Ableton Project/osc_input.amxd has changed