From 36a98407ce53e2d7ae6f1ef3b65794b113ae1606 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Fri, 13 Aug 2010 11:25:55 +1000
Subject: Update changes-4.6.4 with recent shader program changes

---
 dist/changes-4.6.4 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4
index ab59dc5..dbb2189 100644
--- a/dist/changes-4.6.4
+++ b/dist/changes-4.6.4
@@ -64,6 +64,8 @@ QtOpenGL
 --------
 
  - QGLShaderProgram
+    * [QTBUG-12478] Don't resolve GLSL extensions if no shaders.
+    * [QTBUG-12591] setUniformValue(QSize) was setting (w,w) not (w,h).
     * [QTBUG-12862] Don't #define highp/mediump/lowp if the desktop OpenGL
       implementation has the GL_ARB_ES2_compatibility extension.
 
-- 
cgit v0.12