projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d9a0f4 2691546)
Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 20 Aug 2010 09:25:16 +0000 (12:25 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 20 Aug 2010 09:25:16 +0000 (12:25 +0300)
Conflicts:
src/ui/userinfo.cpp

1  2 
src/ui/userinfo.cpp patch | diff1 | diff2 | blob | history

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