]> git.parisson.com Git - piplayer.git/commitdiff
projects / piplayer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d39237 a6b3155)
Merge branch 'dev' master
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Oct 2013 17:21:54 +0000 (19:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Oct 2013 17:21:54 +0000 (19:21 +0200)

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