summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-19 04:46:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-19 04:46:54 (GMT)
commitf6cfafde26b4735965be8df0d11e9d7c297c75b9 (patch)
tree695a5ced898226ffd5a83e5089a0a05735e46e4b /mkspecs
parentc8e35e754ba70f587709af2e5dd87208a6976887 (diff)
parent4d1f74c9c8f26e978f4c3487f2bd8a9af219167f (diff)
downloadQt-f6cfafde26b4735965be8df0d11e9d7c297c75b9.zip
Qt-f6cfafde26b4735965be8df0d11e9d7c297c75b9.tar.gz
Qt-f6cfafde26b4735965be8df0d11e9d7c297c75b9.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: cleanup and remove __FUNCTION__, which breaks build on solaris
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions