diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-07 14:31:58 +0200 |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-07 14:31:58 +0200 |
| commit | 103334ced3b0cb6e69a1ed3075d9b81e591f37e9 (patch) | |
| tree | c7e36b012a042ce864556f9851cb1220d9f385c5 /examples/dbus/complexpingpong/complexpong.cpp | |
| parent | a4391dfd2aef38e3a3d37bee07900296ced2521c (diff) | |
| parent | 490f135caa35831646dac7e00f1c9422cb09aca9 (diff) | |
Merge commit 'qt/master' into kinetic-graphicseffect
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
tests/auto/auto.pro
Diffstat (limited to 'examples/dbus/complexpingpong/complexpong.cpp')
0 files changed, 0 insertions, 0 deletions