projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a336006 4f0d035)
Merge branch 'master' into userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 08:08:51 +0000 (11:08 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 08:08:51 +0000 (11:08 +0300)
Conflicts:
src/ui/userinfopanel.h
src/ui/userpanel.cpp

1  2 
res/images/user_info_item_bottom.png patch | | | blob
res/images/user_info_item_middle.png patch | | | blob
res/images/user_info_item_top.png patch | | | blob

diff --cc res/images/user_info_item_bottom.png
index 0000000,0000000..7a935bc
new file mode 100755 (executable)
Binary files differ
diff --cc res/images/user_info_item_middle.png
index 0000000,0000000..10098a3
new file mode 100755 (executable)
Binary files differ
diff --cc res/images/user_info_item_top.png
index 0000000,0000000..96e6b70
new file mode 100755 (executable)
Binary files differ
Unnamed repository; edit this file to name it for gitweb.