]> git.parisson.com Git - piplayer.git/commitdiff
projects / piplayer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fde3147 19437a8)
Merge branch 'dev' of git.parisson.com:git/piplayer into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Oct 2013 16:45:38 +0000 (18:45 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Oct 2013 16:45:38 +0000 (18:45 +0200)
1  2 
piplayer/player.py patch | diff1 | diff2 | blob | history

diff --cc piplayer/player.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.