projects / qtmeetings / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 81d3e60)
Confilcts solved
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 29 May 2009 10:07:54 +0000 (13:07 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 29 May 2009 10:07:54 +0000 (13:07 +0300)
Conflicts:
src/BusinessLogic/Engine.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp


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