projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2929fde 0060f03)
Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 13 Aug 2010 14:02:31 +0000 (17:02 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 13 Aug 2010 14:02:31 +0000 (17:02 +0300)
Conflicts:
src/ui/indicatorbuttonpanel.cpp


Trivial merge
Unnamed repository; edit this file to name it for gitweb.