projects / qtmeetings / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 04e62b2)
Merge branch 'master_merge' into dev_puontsi
authorSimo Puonti <Simo.Puonti@ixonos.com>
Wed, 27 May 2009 07:37:46 +0000 (10:37 +0300)
committerSimo Puonti <Simo.Puonti@ixonos.com>
Wed, 27 May 2009 07:37:46 +0000 (10:37 +0300)
Conflicts:
src/Domain/Configuration/Configuration.cpp
src/Domain/Configuration/DateTimeSettings.cpp


No differences found
Unnamed repository; edit this file to name it for gitweb.