diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 14:18:43 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 14:18:43 (GMT) |
commit | 4ca0bb3c50a47e991a1304e5d404387da05266a4 (patch) | |
tree | 9a2c33f4fb4c999382fb7d00bddf8fef268a3581 /tests/auto/qdbuscontext/.gitignore | |
parent | ad4535cf5a053ad3ccf6fe6641da7632b1976160 (diff) | |
parent | 3c5eb8766e73c855782552f7c6472801e8ae820c (diff) | |
download | Qt-4ca0bb3c50a47e991a1304e5d404387da05266a4.zip Qt-4ca0bb3c50a47e991a1304e5d404387da05266a4.tar.gz Qt-4ca0bb3c50a47e991a1304e5d404387da05266a4.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:
QNetworkProxyFactory::systemProxyForQuery() for Symbian
Diffstat (limited to 'tests/auto/qdbuscontext/.gitignore')
0 files changed, 0 insertions, 0 deletions