]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0b4a78 8cfcd59)
Merge branch 'aubio' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 May 2013 08:11:52 +0000 (10:11 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 May 2013 08:11:52 +0000 (10:11 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.