diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
| commit | 6e6a3dba2336b158bcb3db633f429edc85534b3d (patch) | |
| tree | 65ebeb098fb7feff01ab5bdee833d9de889c9e44 /FAQ.txt | |
| parent | 606aee01d1f23a5baceb4bd888b2a9d4716fcc34 (diff) | |
| parent | f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b (diff) | |
| download | Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.zip Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.gz Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
src/gui/widgets/qlinecontrol_p.h
Diffstat (limited to 'FAQ.txt')
0 files changed, 0 insertions, 0 deletions