diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 07:35:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 07:35:53 (GMT) |
| commit | 9327490ad51b737211c26cae53a095a8485e2dad (patch) | |
| tree | 6af31940b312d02f5280423903f00c5774f2ca3e /src/gui/egl/qegl_x11.cpp | |
| parent | 14e4fd08ff67578dccf5e85a88fcadf747ae5852 (diff) | |
| parent | 4fb210b9e225fffafdaac26e0acb3c0b71087137 (diff) | |
| download | Qt-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 'src/gui/egl/qegl_x11.cpp')
0 files changed, 0 insertions, 0 deletions