Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Mon, 14 Sep 2009 06:56:58 +0000 (08:56 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Mon, 14 Sep 2009 06:56:58 +0000 (08:56 +0200)
commit9092d68e8a0d8124346069a8fe7949d64aebd178
tree78d636c941d9d12f9a8bf751f1ea17bf8c87ce7e
parent3aa5fec77b2e1edbcbd1d7735389725076f91cbf
parentbd8f1171ea1d564bb9b8e04b1a220e5559d60423
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
src/corelib/codecs/qiconvcodec.cpp