diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 14:33:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 14:33:01 (GMT) |
| commit | 1c379003d168a3232d36fb0690bbc546ec158a06 (patch) | |
| tree | 91d7415c9cd76f8c56e93dd3a8c0228bb633d74b /mkspecs/features/default_post.prf | |
| parent | 0fd2c492ee2e8317a5fbb0fb446816df53d5b17b (diff) | |
| parent | 3ed9e2788e8e8d682484f55eb2e5538d48097b72 (diff) | |
| download | Qt-1c379003d168a3232d36fb0690bbc546ec158a06.zip Qt-1c379003d168a3232d36fb0690bbc546ec158a06.tar.gz Qt-1c379003d168a3232d36fb0690bbc546ec158a06.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qmake: Make smart library merge architecture-aware
Slovenian translation: some updates and fixes
Added galician translation
Fix one hang of QNAM on Symbian.
Diffstat (limited to 'mkspecs/features/default_post.prf')
0 files changed, 0 insertions, 0 deletions