summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/g++.conf
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-04 06:53:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-04 06:53:58 (GMT)
commit73d7fdf686c05adaf0ea8ecddfb264b7741a2e6a (patch)
treefd27b7291a0ded930899854bd75b41b8989fb133 /mkspecs/common/g++.conf
parent1d5041c712acd10020c38a92f1eedc88368ca19f (diff)
parentb4f575f4cc1775fe1c26dedffc78ca1ee2434652 (diff)
downloadQt-73d7fdf686c05adaf0ea8ecddfb264b7741a2e6a.zip
Qt-73d7fdf686c05adaf0ea8ecddfb264b7741a2e6a.tar.gz
Qt-73d7fdf686c05adaf0ea8ecddfb264b7741a2e6a.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fixing winscw def file broken by recent merge runonphone: Change the upload option to allow uploading any file runonphone: Include the manufacturer name in the friendly name on OS X runonphone: Fix usb device enumeration on Mac OS X
Diffstat (limited to 'mkspecs/common/g++.conf')
0 files changed, 0 insertions, 0 deletions