diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 12:26:03 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 12:46:16 +0200 |
| commit | 06dc8791a70329dc8e985a0eed7e434d1f762ec5 (patch) | |
| tree | f3a9f55307207088676d4c48ec67ec418fa56053 /src/gui/painting/qcups.cpp | |
| parent | 59a2ff150795e1281e6b4fea435e74d3434a5ad2 (diff) | |
| parent | 31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f (diff) | |
| download | qt4-tools-06dc8791a70329dc8e985a0eed7e434d1f762ec5.tar.gz | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
configure
src/corelib/global/qglobal.h
src/corelib/tools/qsimd.cpp
Diffstat (limited to 'src/gui/painting/qcups.cpp')
0 files changed, 0 insertions, 0 deletions