projects / qtmeetings / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c019b1 55915c8)
Merge branch 'dev_itkonma'
authoritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 08:50:08 +0000 (11:50 +0300)
committeritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 08:50:08 +0000 (11:50 +0300)
Conflicts:
src/BusinessLogic/UIManager.cpp
src/BusinessLogic/UIManager.h
src/Domain/Configuration/Configuration.cpp

1  2 
src/Domain/Configuration/Configuration.cpp patch | diff1 | diff2 | blob | history

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