diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-04-22 15:12:06 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-04-22 15:12:06 (GMT) |
| commit | 93c617026e093ea788ead5d0eb34686c4a84a77f (patch) | |
| tree | 8eb5ba0befb2a2ea5b28951819358ee5b9f2f923 /examples/desktop | |
| parent | 756d1f3f3b3f1c6c42e0e1afa4f090a6b2e18199 (diff) | |
| parent | 4b4d4b3d7ae4ad019963d957831c46daacba62f7 (diff) | |
| download | Qt-93c617026e093ea788ead5d0eb34686c4a84a77f.zip Qt-93c617026e093ea788ead5d0eb34686c4a84a77f.tar.gz Qt-93c617026e093ea788ead5d0eb34686c4a84a77f.tar.bz2 | |
Merge branch 'master' into gl2engine-new-shaders
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
Diffstat (limited to 'examples/desktop')
0 files changed, 0 insertions, 0 deletions