diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-02-09 15:45:29 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-02-09 15:45:29 (GMT) |
| commit | a49a2ae399643afd30dd5d2df90ecb6d6325121a (patch) | |
| tree | 5ac7bbece7c7ff90f9796430e4eaaff7728dfe29 /src/src.pro | |
| parent | dadfdfaa320aa5951d8512428d59e762b0da79f3 (diff) | |
| parent | 392123ef5432643d1047d1e1dd71512ec39d382d (diff) | |
| download | Qt-a49a2ae399643afd30dd5d2df90ecb6d6325121a.zip Qt-a49a2ae399643afd30dd5d2df90ecb6d6325121a.tar.gz Qt-a49a2ae399643afd30dd5d2df90ecb6d6325121a.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
Diffstat (limited to 'src/src.pro')
0 files changed, 0 insertions, 0 deletions