diff options
| author | axis <qt-info@nokia.com> | 2009-06-08 06:51:51 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-08 06:51:51 (GMT) |
| commit | d4257360234a967bfbacde92ec2bb1ac8979b793 (patch) | |
| tree | a907ea5fe0d3142ecefce50b79c735554efdf39b /src/gui/kernel/qapplication_s60.cpp | |
| parent | 5163d6e1a36f48bf9d8483d3ca23ec730b5188c0 (diff) | |
| parent | 3b2b9d727f0fadf607968c73003e7550c8bd0296 (diff) | |
| download | Qt-d4257360234a967bfbacde92ec2bb1ac8979b793.zip Qt-d4257360234a967bfbacde92ec2bb1ac8979b793.tar.gz Qt-d4257360234a967bfbacde92ec2bb1ac8979b793.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
0 files changed, 0 insertions, 0 deletions