From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 23 Oct 2014 08:32:30 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=188b321003df0940f6f67abe658a42d9bf7a2e8d;p=timeside-diadems.git

Merge branch 'dev'

Conflicts:
	README.rst
---

188b321003df0940f6f67abe658a42d9bf7a2e8d
diff --cc README.rst
index fa5e292,5570066..eadbf16
--- a/README.rst
+++ b/README.rst
@@@ -228,13 -157,13 +157,12 @@@ The encoded OGG file should also be the
  
  Note you can also instanciate each processor with its own class::
  
-  >>> decoder  =  timeside.decoder.file.FileDecoder('sweep.wav')
-  >>> grapher  =  timeside.grapher.waveform_simple.Waveform()
-  >>> analyzer =  timeside.analyzer.level.Level()
-  >>> encoder  =  timeside.encoder.ogg.VorbisEncoder('sweep.ogg')
+  decoder  =  timeside.decoder.file.FileDecoder('sweep.wav')
+  grapher  =  timeside.grapher.waveform_simple.Waveform()
+  analyzer =  timeside.analyzer.level.Level()
+  encoder  =  timeside.encoder.ogg.VorbisEncoder('sweep.ogg')
  
  For more extensive examples, please see the `full documentation <http://files.parisson.com/timeside/doc/>`_.
--
  API / Documentation
  ====================