projects / qtmeetings / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ddaeaa8 bea7a9d)
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 22 May 2009 08:00:10 +0000 (11:00 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 22 May 2009 08:00:10 +0000 (11:00 +0300)
Conflicts:
src/UserInterface/Utils/ProgressBar.cpp


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