Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
authorMartin Smith <msmith@trolltech.com>
Thu, 7 Jan 2010 11:24:44 +0000 (12:24 +0100)
committerMartin Smith <msmith@trolltech.com>
Thu, 7 Jan 2010 11:24:44 +0000 (12:24 +0100)
commitf16556359c24b04afe5af53ddbb80c4392d6dabb
tree5e2fc0123601bd3cc27d0a07236a62d2d8bd418a
parent45af493eeeb408f756cc7d76088cbc3e35f5f54b
parent828b1299e1ecb2da23799a2e49370e00dcf9c126
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
src/corelib/io/qdatastream.cpp