projects / qtmeetings / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7e99ef 60b7802)
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 27 May 2009 13:42:14 +0000 (16:42 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 27 May 2009 13:42:14 +0000 (16:42 +0300)
Conflicts:
src/BusinessLogic/Engine.cpp

1  2 
src/BusinessLogic/Engine.cpp patch | diff1 | diff2 | blob | history

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