projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 720ba73 adf8a4d)
Merge branch 'own_location' into integration
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 11:37:25 +0000 (14:37 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 11:37:25 +0000 (14:37 +0300)
Conflicts:
src/ui/mainwindow.cpp
src/ui/mainwindow.h

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.