diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-10 19:24:12 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-10 19:24:12 (GMT) |
| commit | 66c9d55e58fd9ee9a80270e63a8ebba52db00904 (patch) | |
| tree | 6be8612cb88da5fe76b351023771429196fc4145 /src/gui/painting/qpaintengine_alpha.cpp | |
| parent | 570105f2b16fe38109485313103c9278612b965d (diff) | |
| parent | c9122b19bfd86005080631da8b8f69a01d1ab7e8 (diff) | |
| download | Qt-66c9d55e58fd9ee9a80270e63a8ebba52db00904.zip Qt-66c9d55e58fd9ee9a80270e63a8ebba52db00904.tar.gz Qt-66c9d55e58fd9ee9a80270e63a8ebba52db00904.tar.bz2 | |
Merge commit 'qt/master' into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'src/gui/painting/qpaintengine_alpha.cpp')
0 files changed, 0 insertions, 0 deletions