summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-13 04:14:30 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-13 04:14:30 (GMT)
commit8592bcc80b7ec245b485fa54f8bd41c4484e93e0 (patch)
tree3cda496d06c89d337e37583df6d9af8546c30124 /src/gui/text/qfont.cpp
parent85b089dec584fcc51ad7703ea015ea724c132ed4 (diff)
parent2caea6081fc46217636f0ab70d09891efd2d2864 (diff)
downloadQt-8592bcc80b7ec245b485fa54f8bd41c4484e93e0.zip
Qt-8592bcc80b7ec245b485fa54f8bd41c4484e93e0.tar.gz
Qt-8592bcc80b7ec245b485fa54f8bd41c4484e93e0.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Fixed license header. Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Diffstat (limited to 'src/gui/text/qfont.cpp')
0 files changed, 0 insertions, 0 deletions