summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-22 12:42:06 +0100
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-22 12:42:06 +0100
commitb8fa411051eda208dfd0e0c658710c77a04ce998 (patch)
tree3e14cca2d22113fd732107a505ac86f75b9eeda7 /qmake
parentddebaa91a500566bb73f6e01e68907b7a8f4e699 (diff)
parent0406b2665167d85b3cf348b615a049fb757afa62 (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: amend the doc, as suggested by rittk
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions