diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-08 09:34:01 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-08 09:34:01 +0200 |
| commit | b555f500f4ff2898b3dc7082590773132a1030f1 (patch) | |
| tree | 6380d406e5bba62cc968c8eafe2ca724e67e40a2 /src/gui/painting/qpaintbuffer.cpp | |
| parent | 22e8dd8653281ebf79fc7fc0061b225c8daf2977 (diff) | |
| parent | 74fd14a305ce7402890de1919c3a27ac4d1cbf38 (diff) | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
src/gui/kernel/qapplication.cpp
Diffstat (limited to 'src/gui/painting/qpaintbuffer.cpp')
0 files changed, 0 insertions, 0 deletions