git://git.onelab.eu / sface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8f5d8a 7d7fc90)
Merge branch 'master' of git.onelab.eu:/git/sface
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 10 Sep 2010 17:08:34 +0000 (19:08 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 10 Sep 2010 17:08:34 +0000 (19:08 +0200)
1  2 
sface/screens/mainscreen.py patch | diff1 | diff2 | blob | history

diff --cc sface/screens/mainscreen.py
Simple merge
sface