diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:20:14 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:20:14 (GMT) |
| commit | 61403e81d411b82e8a9ac5e3228267bf9ae0e8e1 (patch) | |
| tree | 0562a4dcf0bcc5365f6cfe7a630f370ef3d471fc /doc/src/scripting | |
| parent | 2e8419e43ce4d5be64bddf1b5b5f5ea9e28c55de (diff) | |
| parent | 63129c8bd21bfdc8110680296bb3bc1ab5e43343 (diff) | |
| download | Qt-61403e81d411b82e8a9ac5e3228267bf9ae0e8e1.zip Qt-61403e81d411b82e8a9ac5e3228267bf9ae0e8e1.tar.gz Qt-61403e81d411b82e8a9ac5e3228267bf9ae0e8e1.tar.bz2 | |
Merge branch '4.7' into qmldocs
Conflicts:
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
Diffstat (limited to 'doc/src/scripting')
0 files changed, 0 insertions, 0 deletions