summaryrefslogtreecommitdiffstats
path: root/src/s60main/s60main.pro
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-09 09:50:15 (GMT)
committeraxis <qt-info@nokia.com>2010-02-09 09:50:15 (GMT)
commit325689d72c77c280f3c5a63a2e4fd2db03f5b304 (patch)
treea582a205e8f6b120591a561f3dbb69b091a0699a /src/s60main/s60main.pro
parent31cd89e8139f178e57ebb9a1b81b289b5df5fc69 (diff)
parent18c9ecc6a381d77128ef1caf7ab9c2990c7e49f7 (diff)
downloadQt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.zip
Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.tar.gz
Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.tar.bz2
Merge branch 'pkgGeneratorForLinux'
Conflicts: mkspecs/symbian/linux-armcc/features/symbian_building.prf
Diffstat (limited to 'src/s60main/s60main.pro')
0 files changed, 0 insertions, 0 deletions