projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07cf1b5 0f72cff)
Merge branch 'master' into new_zoom_buttons_panel
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 13 May 2010 20:43:37 +0000 (23:43 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 13 May 2010 20:43:37 +0000 (23:43 +0300)
Conflicts:
src/ui/mainwindow.cpp

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

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