]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' master 0.7
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 25 Jan 2015 23:12:49 +0000 (00:12 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 25 Jan 2015 23:12:49 +0000 (00:12 +0100)
commit2a654fa376fd88875a0043556e3bb612b1fe6626
treefb58a06661c81776d05ccccb26dcb7eeeb6d0bc9
parenta98f3c6b5dac144d2ff44f7915b5cc0ed344ae0a
parentc58624a0972c35edbbd775abce951b93511149e3
Merge branch 'dev'

Conflicts:
README.rst
doc/source/news.rst
setup.py
timeside/__init__.py
timeside/grapher/render_analyzers.py
README.rst
doc/source/news.rst
timeside/__init__.py
timeside/plugins/analyzer/externals/aubio_pitch.py