projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2c07b5d 8e321cd)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 14:22:24 +0000 (00:22 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 14:22:24 +0000 (00:22 +1000)
commitf50a2555301e7e1d5e4bde32c380a3576e998407
tree53dbef90951408f27c2757ce710dde800fe51c63tree | snapshot
parent2c07b5d2cba8d8e499bd0861eefef12d4e00d99acommit | diff
parent8e321cd869da7ff1cf0168da41aa0246b44867cccommit | diff
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
  Fix crashes with regular expressions QtScript on ARM traditional architectures
tests/auto/qtextcodec/tst_qtextcodec.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e