annotate .svn/pristine/68/68b00a7a7b3e47a6b7ab9ab847a8664cc85e3341.svn-base @ 984:8b6acaabe2da live

Merge from branch "cannam"
author Chris Cannam
date Thu, 25 Oct 2012 14:55:04 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 default:
Chris@909 2 somesetting: foo
Chris@909 3
Chris@909 4 production:
Chris@909 5
Chris@909 6 development:
Chris@909 7
Chris@909 8 test: