]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into aubio
authoryomguy <yomguy@parisson.com>
Sat, 6 Oct 2012 13:12:17 +0000 (15:12 +0200)
committeryomguy <yomguy@parisson.com>
Sat, 6 Oct 2012 13:12:17 +0000 (15:12 +0200)
commitf33e7349dc8a6723788573d60bf43860261965e7
tree6209eb34207e31fc18c699d7961cae589f020bb9
parent28acdaa22ba859f33f9e83c2010627609626fdfa
parent4f0bc85451cac42a66cc2dc3dcd171760de2e647
Merge branch 'dev' into aubio