Merge branch 'graphics-team-text-4.7' into 4.7
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 10 Jan 2011 11:14:55 +0000 (12:14 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 10 Jan 2011 11:14:55 +0000 (12:14 +0100)
commit03dba6aa6d3a4738d2ff63feabff94cec1c1e5cd
treee03b32d1daeae2dc89159cc2bd7a63702a9d7965
parent6e6bdedd06c72f857590b32462548448da6d59b5
parent64852122ba71bbb297b4f1e440f6fabee16ca2fe
Merge branch 'graphics-team-text-4.7' into 4.7
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp