summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-10 12:50:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-10 12:50:12 (GMT)
commit642ea61e13794f36f92f694bc807bc3a4ff1138b (patch)
tree6b92a4c46b93236bb77aae89c6803d58353b6d18 /dist
parentd446a0ec464556ede91225b14e75f2f8f5a748d5 (diff)
parent20097c27f55d8bc61ba41de5997d25f86daa18ed (diff)
downloadQt-642ea61e13794f36f92f694bc807bc3a4ff1138b.zip
Qt-642ea61e13794f36f92f694bc807bc3a4ff1138b.tar.gz
Qt-642ea61e13794f36f92f694bc807bc3a4ff1138b.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: fix QMAKE_COPY_DIR for mingw+sh
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions