diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-21 11:12:18 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-21 11:12:18 (GMT) |
| commit | 1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd (patch) | |
| tree | 066bdf995360981ebb645383b93866133c1ca000 /LICENSE.LGPL | |
| parent | a334ad303d2763cd53fc5bd62945d08d3555b8a7 (diff) | |
| parent | 43bce78bd5a41115ab5a541243cc3edcecd2904e (diff) | |
| download | Qt-1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd.zip Qt-1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd.tar.gz Qt-1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h
Diffstat (limited to 'LICENSE.LGPL')
0 files changed, 0 insertions, 0 deletions