diff options
| author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-05-23 09:56:03 +0300 |
|---|---|---|
| committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-05-23 09:56:03 +0300 |
| commit | 4c7a61b1bad89b3d241175451869fcdcc99ef501 (patch) | |
| tree | 6aae9312f306d9c8428da16d76928edf48b61c93 /config.profiles/symbian/qt.iby | |
| parent | c50519034230005e30ce96be45251c19adabbbd1 (diff) | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
Merge remote-tracking branch 'qt/4.8'
Conflicts:
src/plugins/s60/src/qcoreapplication_3_1.cpp
src/plugins/s60/src/qcoreapplication_3_2.cpp
src/plugins/s60/src/qdesktopservices_3_1.cpp
src/plugins/s60/src/qdesktopservices_3_2.cpp
src/plugins/s60/src/qlocale_3_1.cpp
src/plugins/s60/src/qlocale_3_2.cpp
Diffstat (limited to 'config.profiles/symbian/qt.iby')
0 files changed, 0 insertions, 0 deletions