diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-23 10:48:51 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-23 10:48:51 (GMT) |
commit | 33173f93746aec7771ade4c7f508d52dc19a3d2d (patch) | |
tree | 3138ade49280172d222c8d94d8326e5577e26626 /doc/src/snippets/code/src_gui_dialogs_qwizard.cpp | |
parent | 5e21e9b357a51eb6b3fa349dccf63e33c621fc72 (diff) | |
parent | 68e72ecac7afda1569011d67df8f7f8e250c42f5 (diff) | |
download | Qt-33173f93746aec7771ade4c7f508d52dc19a3d2d.zip Qt-33173f93746aec7771ade4c7f508d52dc19a3d2d.tar.gz Qt-33173f93746aec7771ade4c7f508d52dc19a3d2d.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouch
Conflicts:
src/gui/kernel/qapplication.cpp
Diffstat (limited to 'doc/src/snippets/code/src_gui_dialogs_qwizard.cpp')
0 files changed, 0 insertions, 0 deletions