projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1f040c 094e00d)
Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:34 +0000 (11:04 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:34 +0000 (11:04 +0300)
1  2 
src/ui/friendlistpanel.cpp patch | diff1 | diff2 | blob | history
src/ui/mainwindow.h patch | diff1 | diff2 | blob | history

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