Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Tue, 15 Jun 2010 05:38:54 +0000 (07:38 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Tue, 15 Jun 2010 05:38:54 +0000 (07:38 +0200)
commit37d71b2653b9f31ee73fdd09b0d2be757d4537bd
tree5877aa8f77e34db7ab6d9c58180d32952c65b49c
parenteaa981c943293bf346a041aa4ad3d254e99ebd78
parentdd2be9c7e7540870ddc532f02bd83860273cbbd6
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
src/plugins/imageformats/gif/qgifhandler.cpp
tests/auto/qimagereader/tst_qimagereader.cpp