summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-06 07:35:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-06 07:35:53 (GMT)
commit9327490ad51b737211c26cae53a095a8485e2dad (patch)
tree6af31940b312d02f5280423903f00c5774f2ca3e /examples/declarative
parent14e4fd08ff67578dccf5e85a88fcadf747ae5852 (diff)
parent4fb210b9e225fffafdaac26e0acb3c0b71087137 (diff)
downloadQt-9327490ad51b737211c26cae53a095a8485e2dad.zip
Qt-9327490ad51b737211c26cae53a095a8485e2dad.tar.gz
Qt-9327490ad51b737211c26cae53a095a8485e2dad.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: Fix proxy reading from gconf so that it is only done once / session.
Diffstat (limited to 'examples/declarative')
0 files changed, 0 insertions, 0 deletions