summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimage.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-03 14:23:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-03 14:23:55 (GMT)
commit920ce5ed71bc456e429b887801a8d8bea7a3db0d (patch)
treeac2f3414c1dbf8ebbbccb55f2c44e709225db850 /src/gui/image/qimage.h
parent6376a09e2fd6c2668c771f02217f9e7f58bafd99 (diff)
parent2eb50141ed4431861512be36d9a578aa7608186e (diff)
downloadQt-920ce5ed71bc456e429b887801a8d8bea7a3db0d.zip
Qt-920ce5ed71bc456e429b887801a8d8bea7a3db0d.tar.gz
Qt-920ce5ed71bc456e429b887801a8d8bea7a3db0d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Fix gamma corrected source color in GL
Diffstat (limited to 'src/gui/image/qimage.h')
0 files changed, 0 insertions, 0 deletions