diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 12:32:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 12:32:31 (GMT) |
| commit | c392cb990ea27e4fa81683b3b2bcae844fad3039 (patch) | |
| tree | 049be4a7846a88a77a365d9e1f62e995698990fd /tools/qtconfig/paletteeditoradvancedbase.h | |
| parent | 75fd46451cabd680d16913d5dfd4733c09db3459 (diff) | |
| parent | 688d6db785af821e76b9e436ef9d9cbea95ef5ad (diff) | |
| download | Qt-c392cb990ea27e4fa81683b3b2bcae844fad3039.zip Qt-c392cb990ea27e4fa81683b3b2bcae844fad3039.tar.gz Qt-c392cb990ea27e4fa81683b3b2bcae844fad3039.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:
make -markuntranslated work without -idbased
fix conditional on shell type
Diffstat (limited to 'tools/qtconfig/paletteeditoradvancedbase.h')
0 files changed, 0 insertions, 0 deletions