]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into aubio
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 23:19:59 +0000 (01:19 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 23:19:59 +0000 (01:19 +0200)
commit45af5db28ae7daf5bf83b0d95f4778f4890c1df0
tree1c56a5e040605f45000b3d2a57bffb2b7039326e
parent89ec4fe839e1ddf45088645e705bf15babb0c7c1
parent9d9cad12dd21a564bc671cb1ea8a2f2fbd733d10
Merge branch 'dev' into aubio