summaryrefslogtreecommitdiffstats
path: root/src/script/parser
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-25 01:26:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-25 01:26:35 (GMT)
commitf793344d17b0ec5df4987e123cc1e3b008a949bb (patch)
treeec1768c2622d9e564be01a3ab47ef058d79387c9 /src/script/parser
parent100a56f323a008edb0a451ab052f1a0d5edcc547 (diff)
parent72acc2eac69a5f58f8d99c25cb58f0afaebec7a4 (diff)
downloadQt-f793344d17b0ec5df4987e123cc1e3b008a949bb.zip
Qt-f793344d17b0ec5df4987e123cc1e3b008a949bb.tar.gz
Qt-f793344d17b0ec5df4987e123cc1e3b008a949bb.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.
Diffstat (limited to 'src/script/parser')
0 files changed, 0 insertions, 0 deletions