summaryrefslogtreecommitdiffstats
path: root/qmake/main.cpp
diff options
context:
space:
mode:
authorWater-Team <water@pad.test.qt.nokia.com>2011-08-16 23:00:13 (GMT)
committerWater-Team <water@pad.test.qt.nokia.com>2011-08-16 23:00:13 (GMT)
commitfb934f2a8d7398a3ff39a107093f9da6ceda59a7 (patch)
tree6c7964a0fbae7d2495aa7f51fad6f74c952ac184 /qmake/main.cpp
parent69bd07dd091d43049fa8dafa8ec063ab6c90a1fa (diff)
parent023f6408358b3caba02e7a88accbfb64b261e21e (diff)
downloadQt-fb934f2a8d7398a3ff39a107093f9da6ceda59a7.zip
Qt-fb934f2a8d7398a3ff39a107093f9da6ceda59a7.tar.gz
Qt-fb934f2a8d7398a3ff39a107093f9da6ceda59a7.tar.bz2
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'qmake/main.cpp')
0 files changed, 0 insertions, 0 deletions