diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-20 11:24:25 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-20 11:24:25 (GMT) |
| commit | 1ee923a21c270094203c5d2a861a8015598ceda1 (patch) | |
| tree | d53b292eabb1fc565840153d8f5efb3c3b2afd52 /src/gui/kernel/qapplication.h | |
| parent | 4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed (diff) | |
| parent | 691e83425ac5883922837bc5fd1efb5385db9871 (diff) | |
| download | Qt-1ee923a21c270094203c5d2a861a8015598ceda1.zip Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.gz Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/stylesheet.qdoc
Diffstat (limited to 'src/gui/kernel/qapplication.h')
0 files changed, 0 insertions, 0 deletions