Merge branch 'dev' into diadems

author Thomas Fillon <thomas@parisson.com>

Fri, 7 Feb 2014 16:15:18 +0000 (17:15 +0100)

committer Thomas Fillon <thomas@parisson.com>

Fri, 7 Feb 2014 16:15:18 +0000 (17:15 +0100)
author Thomas Fillon <thomas@parisson.com>
Fri, 7 Feb 2014 16:15:18 +0000 (17:15 +0100)
committer Thomas Fillon <thomas@parisson.com>
Fri, 7 Feb 2014 16:15:18 +0000 (17:15 +0100)
diff --cc timeside/analyzer/__init__.py
Simple merge
diff --cc timeside/analyzer/irit_speech_4hz.py
Simple merge
diff --cc timeside/analyzer/irit_speech_entropy.py
Simple merge
author	Thomas Fillon <thomas@parisson.com>
	Fri, 7 Feb 2014 16:15:18 +0000 (17:15 +0100)
committer	Thomas Fillon <thomas@parisson.com>
	Fri, 7 Feb 2014 16:15:18 +0000 (17:15 +0100)
		1	2
timeside/analyzer/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
timeside/analyzer/irit_speech_4hz.py	patch \|	diff1 \|	diff2 \|	blob \| history
timeside/analyzer/irit_speech_entropy.py	patch \|	diff1 \|	diff2 \|	blob \| history