summaryrefslogtreecommitdiffstats
path: root/util/normalize/README
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2011-03-17 16:48:28 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2011-03-17 16:48:28 (GMT)
commit08d5655d4ac291f97d164c96ecfe0a0d7e4ba654 (patch)
tree9ea65423fcb04e6f33d12a46582a730a4d1358fe /util/normalize/README
parent903a52cd764ba4ace6c4d2d3b692f5b563fb326c (diff)
parenta70f9f5908f2db187e6818103d9599e1e45c130d (diff)
downloadQt-08d5655d4ac291f97d164c96ecfe0a0d7e4ba654.zip
Qt-08d5655d4ac291f97d164c96ecfe0a0d7e4ba654.tar.gz
Qt-08d5655d4ac291f97d164c96ecfe0a0d7e4ba654.tar.bz2
Merge branch 'master-i18n' of scm.dev.nokia.troll.no:qt/qt-earth-team into master-i18n
Conflicts: src/corelib/tools/qlocale.h
Diffstat (limited to 'util/normalize/README')
0 files changed, 0 insertions, 0 deletions