diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2010-02-04 09:08:43 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2010-02-04 09:08:43 (GMT) |
| commit | 47b7af3bfd78c6d4efd3ce93be275a60430679d2 (patch) | |
| tree | e7d7ff32ae72008b74df37e13caf568b33ac19b5 /src/gui/image/qiconloader.cpp | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
| parent | 39523f9f78a7c93643924711b1ed8006ebfcf5ce (diff) | |
| download | Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.zip Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.gz Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Manual resolve of conflict in changes-4.6.2 in staging-2.
Conflicts:
dist/changes-4.6.2
Diffstat (limited to 'src/gui/image/qiconloader.cpp')
0 files changed, 0 insertions, 0 deletions