summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-08-26 09:31:27 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-08-26 09:31:27 (GMT)
commit69354f37173b7bfcf7ea0f37175a34b8766afcbb (patch)
treed5d35fbb1c5b93470b6b1aa03c359ac09695055f /qmake/Makefile.win32
parent065610d14fda00057724a46e2649db6bb98aca58 (diff)
parente5aa5a9d7e97b975316b8cc18554743cccf06474 (diff)
downloadQt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.zip
Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.gz
Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.bz2
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
Diffstat (limited to 'qmake/Makefile.win32')
0 files changed, 0 insertions, 0 deletions