diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 08:51:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 08:51:17 (GMT) |
| commit | b18ed8179f7289f700e7e8c280b3f68fefc7097d (patch) | |
| tree | d7f76b23e49c01491b81b776a847218fdacbefef /src/network/access/qftp.h | |
| parent | 9a32c5940f259f101f13b91dcb95d9861fb9043d (diff) | |
| parent | f7fe4701713aff5f5af146fafbb38fa852ebde33 (diff) | |
| download | Qt-b18ed8179f7289f700e7e8c280b3f68fefc7097d.zip Qt-b18ed8179f7289f700e7e8c280b3f68fefc7097d.tar.gz Qt-b18ed8179f7289f700e7e8c280b3f68fefc7097d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add license header
Fixed bounds calculation in QtSvg.
Fixed vector-effect property output from QSvgGenerator.
Added text benchmarks from qtbench to tests/benchmarks
Diffstat (limited to 'src/network/access/qftp.h')
0 files changed, 0 insertions, 0 deletions