diff options
| author | axis <qt-info@nokia.com> | 2009-09-30 14:22:38 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-09-30 14:22:38 (GMT) |
| commit | d4d02daeb0bea195f3ed045cfbbfe7e604420f10 (patch) | |
| tree | 270eda2164f38afcdaa485bdc4935a4ed8eea9fe /tools/assistant | |
| parent | 68f709fb180af94af259a9afb873b9548c97c0fb (diff) | |
| parent | 5dadf715a40189c94235e8445dc79f0270b0a87e (diff) | |
| download | Qt-d4d02daeb0bea195f3ed045cfbbfe7e604420f10.zip Qt-d4d02daeb0bea195f3ed045cfbbfe7e604420f10.tar.gz Qt-d4d02daeb0bea195f3ed045cfbbfe7e604420f10.tar.bz2 | |
Merge branch 'focusFixes' into 4.6
Conflicts:
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
Diffstat (limited to 'tools/assistant')
0 files changed, 0 insertions, 0 deletions