]> git.parisson.com Git - timeside.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Sep 2013 10:37:30 +0000 (12:37 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Sep 2013 10:37:30 +0000 (12:37 +0200)
commitf309ae3fbe792b362204a7ae0f37c51a7d42e556
tree113d982f9112b69769fc1292bb5f6b7225732270
parentf77b97e493583e86cd495d3feabb49506e111ca3
parent81a4e9a2d0ef6eb8ea4c0aac84af0d53b782d300
Merge branch 'master' into dev

Conflicts:
README.rst
README.rst
setup.py
timeside/__init__.py
timeside/decoder/core.py