summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-04 00:34:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-04 00:34:18 (GMT)
commitc3f891552693204e49db8e7d461c55aea804016e (patch)
tree77840815d9f6619f691c9d835de5b43c1c12b733 /doc/src
parent58c591974bf34577e27638f1328a04c4f7c698f8 (diff)
parent068177288001c46896d6b04c520731adb56ed288 (diff)
downloadQt-c3f891552693204e49db8e7d461c55aea804016e.zip
Qt-c3f891552693204e49db8e7d461c55aea804016e.tar.gz
Qt-c3f891552693204e49db8e7d461c55aea804016e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
Diffstat (limited to 'doc/src')
0 files changed, 0 insertions, 0 deletions