annotate .svn/pristine/14/142eda77e7e23817ff1c9eecae08c12f33882ae4.svn-base @ 926:b73a59a6acbd luisf

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:10:11 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 en:
Chris@909 2 hello: "Hello from beta"
Chris@909 3 plugin: "beta"