]> git.parisson.com Git - piplayer.git/commitdiff
projects / piplayer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 093c7ab 45f148b)
Merge branch 'master' of https://github.com/yomguy/PiPlayer
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Oct 2013 07:06:16 +0000 (09:06 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Oct 2013 07:06:16 +0000 (09:06 +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.