diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 01:16:16 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 01:16:16 (GMT) |
commit | c55ac19acfcad0e204d9e9dc47fb4bf891924e0a (patch) | |
tree | 970dee9f6b24092cb2597ef2389137a9b10ac876 /src/tools/uic/cpp | |
parent | 3671dbf34940e166b747b6f8f3f5758fd486073c (diff) | |
parent | 6f9eb6f97bdace74111180bc548f21f613e2674c (diff) | |
download | Qt-c55ac19acfcad0e204d9e9dc47fb4bf891924e0a.zip Qt-c55ac19acfcad0e204d9e9dc47fb4bf891924e0a.tar.gz Qt-c55ac19acfcad0e204d9e9dc47fb4bf891924e0a.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:
specify the configuration's purpose based on security mode of network.
Diffstat (limited to 'src/tools/uic/cpp')
0 files changed, 0 insertions, 0 deletions