diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-03 12:12:52 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-03 12:12:52 (GMT) |
| commit | cb80c41e7bced1877312468e7f65e3a561e7d161 (patch) | |
| tree | 4f8b9d8008b12e9c810705e8254182e2423310a3 /doc/src/painting-and-printing | |
| parent | aacf7c5a8b98f0dd4039d7f7a9d0471c32034a3b (diff) | |
| parent | ca68786e62e0e645b692dc19a87b7dc3b2219ffd (diff) | |
| download | Qt-cb80c41e7bced1877312468e7f65e3a561e7d161.zip Qt-cb80c41e7bced1877312468e7f65e3a561e7d161.tar.gz Qt-cb80c41e7bced1877312468e7f65e3a561e7d161.tar.bz2 | |
Merge branch '4.7' into qmldocs
Conflicts:
doc/src/snippets/declarative/qml-intro/basic-syntax.qml
Diffstat (limited to 'doc/src/painting-and-printing')
0 files changed, 0 insertions, 0 deletions