summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-23 06:03:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-23 06:03:17 (GMT)
commit8960973e97713205d1aeb209806daca456c55111 (patch)
treede1541e307f870d1efbcf413346ef8e54032e077 /src/declarative
parent1e0530130a8d2afeecfa60bb898c055d15ff8a82 (diff)
parent951e46bc21168cb66780f932006ec41b7dfea234 (diff)
downloadQt-8960973e97713205d1aeb209806daca456c55111.zip
Qt-8960973e97713205d1aeb209806daca456c55111.tar.gz
Qt-8960973e97713205d1aeb209806daca456c55111.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNetworkProxy documentation: mention usage of "http_proxy" variable
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions