diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:26:10 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:26:10 (GMT) |
| commit | eb9d1bb05ca32af2658ad38ea731c9ddf17a4954 (patch) | |
| tree | be6a8b2b76f55d80df77ade91f1f43d32971fe64 /src/opengl/qwindowsurface_gl.cpp | |
| parent | db76fd9b3cc0acb49c7c017c85ac3326953167f5 (diff) | |
| parent | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (diff) | |
| download | Qt-eb9d1bb05ca32af2658ad38ea731c9ddf17a4954.zip Qt-eb9d1bb05ca32af2658ad38ea731c9ddf17a4954.tar.gz Qt-eb9d1bb05ca32af2658ad38ea731c9ddf17a4954.tar.bz2 | |
Merge branch 'qt-4.7' into lighthouse-4.7
Conflicts:
src/opengl/opengl.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
Diffstat (limited to 'src/opengl/qwindowsurface_gl.cpp')
0 files changed, 0 insertions, 0 deletions