diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 00:22:24 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 00:22:24 +1000 |
| commit | f50a2555301e7e1d5e4bde32c380a3576e998407 (patch) | |
| tree | 53dbef90951408f27c2757ce710dde800fe51c63 /src/gui/text/text.pri | |
| parent | 2c07b5d2cba8d8e499bd0861eefef12d4e00d99a (diff) | |
| parent | 8e321cd869da7ff1cf0168da41aa0246b44867cc (diff) | |
| download | qt4-tools-f50a2555301e7e1d5e4bde32c380a3576e998407.tar.gz | |
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
Diffstat (limited to 'src/gui/text/text.pri')
0 files changed, 0 insertions, 0 deletions