summaryrefslogtreecommitdiffstats
path: root/src/qbase.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-01 08:27:08 +0100
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-01 08:27:08 +0100
commitf3da2f414f9fce9aa014da79be9f50c075c60936 (patch)
treebcf78f1d5a39e9dd07b5de54dd712ab00af74b72 /src/qbase.pri
parent424fb9610473c15adfa5dd38606be032ebacd536 (diff)
parent6e8f18941ccbb1eb465c776f4b1f5f65f038748d (diff)
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 'src/qbase.pri')
0 files changed, 0 insertions, 0 deletions