projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa03eac 3e6e241)
Merge branch 'master' into text_cutting_bug
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 05:31:40 +0000 (08:31 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 05:31:40 +0000 (08:31 +0300)
1  2 
src/ui/friendlistpanel.cpp patch | diff1 | diff2 | blob | history

diff --cc src/ui/friendlistpanel.cpp
Simple merge
Unnamed repository; edit this file to name it for gitweb.