summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-12-20 15:51:16 (GMT)
committeraxis <qt-info@nokia.com>2010-12-20 15:51:16 (GMT)
commit52ffd9f99febcc1b8192f653d9ad39dc8f6e9172 (patch)
tree33d03cd2374c7be06836fb63b0a5f40620883c5c /mkspecs
parent64e1f888586f2c988b08bcc93579990e970b7206 (diff)
parentd9c00320a1e1f6aa7d0083b3415704e20e216a1f (diff)
parentb24447e0f20db4a40df724476c6542ea44590935 (diff)
downloadQt-52ffd9f99febcc1b8192f653d9ad39dc8f6e9172.zip
Qt-52ffd9f99febcc1b8192f653d9ad39dc8f6e9172.tar.gz
Qt-52ffd9f99febcc1b8192f653d9ad39dc8f6e9172.tar.bz2
Merge branches 'nonQtApps-fix' and 'merge-request-2516' into master-s60