summaryrefslogtreecommitdiffstats
path: root/mkspecs/cygwin-g++
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-12-16 08:37:34 (GMT)
committeraxis <qt-info@nokia.com>2009-12-16 08:37:34 (GMT)
commit6e527912d719b0448b91eba1d6a99b9cbe58170a (patch)
tree17ba94b2af34ba2ab953fbd7be84955bdea39370 /mkspecs/cygwin-g++
parent8152bd167c1a728c54a9976297bb53e09d131d66 (diff)
parenta9d4faa330698a7972c7fa4b3582fb20548b32f6 (diff)
downloadQt-6e527912d719b0448b91eba1d6a99b9cbe58170a.zip
Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.gz
Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts: src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'mkspecs/cygwin-g++')
0 files changed, 0 insertions, 0 deletions