projects
/
qtmeetings
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fcb810b
0707d97
)
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
author
Zoltan Papp
<zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 07:12:18 +0000
(10:12 +0300)
committer
Zoltan Papp
<zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 07:12:18 +0000
(10:12 +0300)
1
2
src/BusinessLogic/Engine.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/BusinessLogic/UIManager.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/BusinessLogic/Engine.cpp
Simple merge
diff --cc
src/BusinessLogic/UIManager.cpp
Simple merge
diff --cc
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
Simple merge