summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-06-21 10:25:50 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-06-21 10:25:50 (GMT)
commit9af06ac8c7e86b236a571e1560ecd8f234bb2a67 (patch)
tree82e0a957f53f73b443ac088a39f9cbcac9bd399e /qmake/generators
parent166c41a3ee7485293022b31b90cbbdfe6119aed8 (diff)
parentbbaa64882618e565510ef7ae959062073d4d2ae1 (diff)
downloadQt-9af06ac8c7e86b236a571e1560ecd8f234bb2a67.zip
Qt-9af06ac8c7e86b236a571e1560ecd8f234bb2a67.tar.gz
Qt-9af06ac8c7e86b236a571e1560ecd8f234bb2a67.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'qmake/generators')
0 files changed, 0 insertions, 0 deletions