Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 12:04:01 +0000 (22:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 12:04:01 +0000 (22:04 +1000)
commitd3b376865e33c91040325a2e6e74e94b09c8dd6b
tree71625f3ececa3b5b4b9a49bc71a11d6d9a79693e
parent49cf3e27e2b63ca799d5fb8478673d4c92ff2995
parent4f2138ecfbdc58e5cb5b0c7d762197ef69752957
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range