diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-21 18:43:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-21 18:43:38 (GMT) |
| commit | 0a83a6c571fadb454cb8711aed84258b061d44b5 (patch) | |
| tree | 6afaa6cde3028bba5162340b02a67268348bfbe2 /tests/auto/auto.pro | |
| parent | 2181a341839b72a627a7ef641de58d1d2411f123 (diff) | |
| parent | fa93b7a048914205bcd17fd33a26344a54d4af9f (diff) | |
| download | Qt-0a83a6c571fadb454cb8711aed84258b061d44b5.zip Qt-0a83a6c571fadb454cb8711aed84258b061d44b5.tar.gz Qt-0a83a6c571fadb454cb8711aed84258b061d44b5.tar.bz2 | |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert "Factored readRegistryKey implementation out of qmake"
Revert "Factored epocRoot implementation out of qmake"
Diffstat (limited to 'tests/auto/auto.pro')
0 files changed, 0 insertions, 0 deletions