diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-06 16:43:57 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-06 16:43:57 +0100 |
| commit | 9888fa259875d82bf08a28cac134fe6f71f371f0 (patch) | |
| tree | a58a6ab673888d5c352d2cfe98b22fb1c11c40e9 /tools/qvfb/qvfbratedlg.cpp | |
| parent | a70ccc4aaad74dbf28569c78479d4668781bb0fe (diff) | |
| parent | 9327490ad51b737211c26cae53a095a8485e2dad (diff) | |
| download | qt4-tools-9888fa259875d82bf08a28cac134fe6f71f371f0.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'tools/qvfb/qvfbratedlg.cpp')
0 files changed, 0 insertions, 0 deletions