summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-29 17:54:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-29 17:54:11 (GMT)
commit6e8f18941ccbb1eb465c776f4b1f5f65f038748d (patch)
treefb332d57d2928a4b8c427b8b586984089282b529 /lib
parent26af4d54ea4f3a48d053038f34a00aa1119a585b (diff)
parentcefda8e4491ff82c96fceea2091f69160f8ae584 (diff)
downloadQt-6e8f18941ccbb1eb465c776f4b1f5f65f038748d.zip
Qt-6e8f18941ccbb1eb465c776f4b1f5f65f038748d.tar.gz
Qt-6e8f18941ccbb1eb465c776f4b1f5f65f038748d.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Fix unintended tr context change.
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions