annotate .svn/pristine/14/142eda77e7e23817ff1c9eecae08c12f33882ae4.svn-base @ 1348:0f5c32bfd33e live

Merge from branch "luisf"
author Chris Cannam
date Wed, 03 Jul 2013 09:57:31 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 en:
Chris@909 2 hello: "Hello from beta"
Chris@909 3 plugin: "beta"