diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 21:43:46 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 21:43:46 +1000 |
commit | e60f05201f5bc412ec8c02625bcbbca5ba50812c (patch) | |
tree | 68d5af1df341b622d715fa3b4986767727e2b931 /examples/threads/mandelbrot/mandelbrotwidget.cpp | |
parent | fe0ae9fd2a59a29b42fefd8cacdf8b79cbf696e9 (diff) | |
parent | eb44ca51f19a2218cfef3481429eb571e1fc46e5 (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
QUrl auto test: include core-private headers
QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."
Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore
Diffstat (limited to 'examples/threads/mandelbrot/mandelbrotwidget.cpp')
0 files changed, 0 insertions, 0 deletions