diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-07 16:43:12 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-07 16:43:12 (GMT) |
| commit | 6c067866db65f113237a4c28374317c948da8ba9 (patch) | |
| tree | c8920e1ecbd4c6875691f52d5579e7264fb4af0d /src/opengl/qpixmapdata_gl_p.h | |
| parent | 61bec93c12bdc2912b38264386af07f80c3c0272 (diff) | |
| parent | 90a65aa6611eb33229cdc00ffe6c22012944ba1a (diff) | |
| download | Qt-6c067866db65f113237a4c28374317c948da8ba9.zip Qt-6c067866db65f113237a4c28374317c948da8ba9.tar.gz Qt-6c067866db65f113237a4c28374317c948da8ba9.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
Diffstat (limited to 'src/opengl/qpixmapdata_gl_p.h')
0 files changed, 0 insertions, 0 deletions