diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-21 23:00:22 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-21 23:00:22 (GMT) |
| commit | 4c47a46be986681225b67faa73f957276636cc30 (patch) | |
| tree | 111f23861ce66ca30a17189fb611ff3854b57d66 /src/gui/image/qpixmap.cpp | |
| parent | b696d941c06535b7a7813c4d3b39dbd3710476e4 (diff) | |
| parent | 27c18a5cd8dbe2d22c8717044922ad5437e6fff4 (diff) | |
| download | Qt-4c47a46be986681225b67faa73f957276636cc30.zip Qt-4c47a46be986681225b67faa73f957276636cc30.tar.gz Qt-4c47a46be986681225b67faa73f957276636cc30.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
0 files changed, 0 insertions, 0 deletions