summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-03 00:18:24 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-03 00:56:41 +0200
commite6286ca289db11463d13ec4d31055995b32ad258 (patch)
tree944bd3a2e93691bdd977ef7818b8241c1193d888 /src/opengl/qgl.h
parentbeb7258a56b6ec76531b73cc07ee30132a3f548f (diff)
parent9ae89313e43689483282ac330ad189db89bfcbba (diff)
Merge remote-tracking branch 'origin/release' into stable
Manually fixed up: isES -> isOpenGLES src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
Diffstat (limited to 'src/opengl/qgl.h')
0 files changed, 0 insertions, 0 deletions