diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:17:37 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:17:37 (GMT) |
| commit | fd2616977e5e03afa3be9b455bc0a6be19f9132f (patch) | |
| tree | b71404860117132253b7e76832adf28748ca81cb /doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp | |
| parent | 12f4fc296578fb30ac1bf690b3eeba176b72205a (diff) | |
| parent | 219e2fa7ace74d87fda4ed8c3a2a75005fab10b9 (diff) | |
| download | Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.zip Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.tar.gz Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/extra/qmlbehavior.cpp
src/declarative/extra/qmlbehavior.h
Diffstat (limited to 'doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp')
0 files changed, 0 insertions, 0 deletions