]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into aubio
authoryomguy <yomguy@parisson.com>
Sat, 6 Oct 2012 21:05:58 +0000 (23:05 +0200)
committeryomguy <yomguy@parisson.com>
Sat, 6 Oct 2012 21:05:58 +0000 (23:05 +0200)
commit3fc3c1c9f4206787288403e347cd7306afd3dc5d
treefca5d2c6c1d72974433fba8f438a85c132f6f018
parentf33e7349dc8a6723788573d60bf43860261965e7
parent15377c1807001fdb46e40ffc3f9fcc0941c9f7bc
Merge branch 'dev' into aubio