]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into aubio
authoryomguy <yomguy@parisson.com>
Fri, 28 Sep 2012 22:45:34 +0000 (00:45 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 28 Sep 2012 22:45:34 +0000 (00:45 +0200)
commit89ec4fe839e1ddf45088645e705bf15babb0c7c1
tree2f5838a313e1b69ef148f311598658765b5d63e9
parent8dac0f37c0147604e380ca3b1f0d9a0b4616761f
parent665e2ab22732d3cbae22492d230a5d65a4a1bf3a
Merge branch 'dev' into aubio