diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-30 00:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-30 00:00:11 (GMT) |
| commit | e0801405dc18384358eec85663d5bff8b5ea56a0 (patch) | |
| tree | 98cad0e5d10fff5ce8273b764c90754a005ed44b /src/gui/image/qimage.cpp | |
| parent | 94cfa52c94cb5fcd621bcec04dcc4d2546a1a608 (diff) | |
| parent | d9eb6c14fe32f90f6cef6a580e629c426455049e (diff) | |
| download | Qt-e0801405dc18384358eec85663d5bff8b5ea56a0.zip Qt-e0801405dc18384358eec85663d5bff8b5ea56a0.tar.gz Qt-e0801405dc18384358eec85663d5bff8b5ea56a0.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/gui/image/qimage.cpp')
0 files changed, 0 insertions, 0 deletions