]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into gst 0.3.4-noleekmp3
authoryomguy <yomguy@parisson.com>
Wed, 19 Sep 2012 18:48:14 +0000 (20:48 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 19 Sep 2012 18:48:14 +0000 (20:48 +0200)
commit2043796dd1c69e2c604ff3987d1881250ef59c06
tree82c091a20887ea341cb2ea1a81b3f960d6fcb7d8
parent1d2cfcd4035bce19ad18e1df8eb1d85952a2a2c6
parent236d763cbb217f2e9c6ad800a2d1a3ccc9a04543
Merge branch 'dev' into gst

Conflicts:
tests/testdecoding.py
tests/testdecoding.py