diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:05:08 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:05:08 (GMT) |
| commit | fbbdb701978cb66577472c6d2c9060b2fb208f30 (patch) | |
| tree | 44614b8add20ea5f89e3cbe5e87ba8b9eff1e781 /tests/auto/qpointer | |
| parent | 3b9674c720a8aca2558a344e9ca08219687afc91 (diff) | |
| parent | bb6d5d9eb2a40de14ab3a41fbdaf4092c1a3b4e8 (diff) | |
| download | Qt-fbbdb701978cb66577472c6d2c9060b2fb208f30.zip Qt-fbbdb701978cb66577472c6d2c9060b2fb208f30.tar.gz Qt-fbbdb701978cb66577472c6d2c9060b2fb208f30.tar.bz2 | |
Merge branch 'qdoc-simplified' of ../qt-doc-team-qdoc-simplified into qdoc-simplified
Conflicts:
tools/qdoc3/qmlcodemarker.cpp
tools/qdoc3/qmlcodemarker.h
Diffstat (limited to 'tests/auto/qpointer')
0 files changed, 0 insertions, 0 deletions