]> git.parisson.com Git - timeside.git/commit
Merge branch 'live' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 16:31:03 +0000 (17:31 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 16:31:03 +0000 (17:31 +0100)
commit50e4dd223b72a306d42d4dd73a8a303f9fc41a72
tree8cab44101b9aa70540909830777f46999bb4117c
parent0b11c0245aeac0f27f0d39a42d5ce2e6b0f4898f
parent2443ddb480c31ec2f40707fb3a6fca9286cdfd02
Merge branch 'live' into dev

Conflicts:
tests/test_decoding.py
timeside/decoder/core.py
tests/test_decoding.py
timeside/core.py
timeside/decoder/file.py