Merge branch 'windows+cc' into cairocanvas

author John Emmas <johne53@tiscali.co.uk>

Mon, 13 Jan 2014 15:05:30 +0000 (15:05 +0000)

committer John Emmas <johne53@tiscali.co.uk>

Mon, 13 Jan 2014 15:05:30 +0000 (15:05 +0000)
author John Emmas <johne53@tiscali.co.uk>
Mon, 13 Jan 2014 15:05:30 +0000 (15:05 +0000)
committer John Emmas <johne53@tiscali.co.uk>
Mon, 13 Jan 2014 15:05:30 +0000 (15:05 +0000)
diff --cc libs/audiographer/audiographer/debuggable.h
Simple merge
diff --cc libs/audiographer/audiographer/general/silence_trimmer.h
Simple merge
author	John Emmas <johne53@tiscali.co.uk>
	Mon, 13 Jan 2014 15:05:30 +0000 (15:05 +0000)
committer	John Emmas <johne53@tiscali.co.uk>
	Mon, 13 Jan 2014 15:05:30 +0000 (15:05 +0000)
		1	2
libs/audiographer/audiographer/debuggable.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/audiographer/audiographer/general/silence_trimmer.h	patch \|	diff1 \|	diff2 \|	blob \| history