diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-26 21:49:41 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-26 21:49:42 +0200 |
| commit | d013eb055c31cec9bc29126939be109e0ac1aad5 (patch) | |
| tree | 352ae70aa5ecebd665bd6b36d68348f31cd5781e /src/gui/opengl/qopenglshaderprogram.cpp | |
| parent | 9fabb548daed933a54d24871eade9f60f9c2ae55 (diff) | |
| parent | 78f9f4b4970e6f4155b7cf2e88c6ac540dec47bc (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic5a232260a6c8ee71f9ff91e820f54c36ab6b15a
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions