projects / situare / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 34b0044 a8b24f7)
Merge branch 'locationlistview' of https://vcs.maemo.org/git/situare into locationlis...
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 17 Aug 2010 06:41:57 +0000 (09:41 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 17 Aug 2010 06:41:57 +0000 (09:41 +0300)
commit5aca54fcb69ffb386b3755f34edb5ef077a411bf
tree4ea4554770d4daee7e106bf4b42d0d954ec27e9etree | snapshot
parent34b0044ed564b0ca43bb0c01e519efa62736619ccommit | diff
parenta8b24f71415657fe0aaa45c042347c8b4259bb69commit | diff
Merge branch 'locationlistview' of https://vcs.maemo.org/git/situare into locationlistview

Conflicts:
src/ui/mainwindow.cpp
src/ui/mainwindow.cpp diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.