diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-08 12:09:17 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-08 12:09:17 (GMT) |
| commit | 492f1f4267074525e33fb8571c12d520e92163a6 (patch) | |
| tree | f121cc4aabf683208dda00b50bc84bca55fffb7a /src/plugins | |
| parent | dd1a2ad2eb40afd29d418cdf54544d110d39dc25 (diff) | |
| parent | e98c07e5247a5ad4876c4add595ec1897b73b190 (diff) | |
| download | Qt-492f1f4267074525e33fb8571c12d520e92163a6.zip Qt-492f1f4267074525e33fb8571c12d520e92163a6.tar.gz Qt-492f1f4267074525e33fb8571c12d520e92163a6.tar.bz2 | |
Merge branch 'geometry-shaders-to-integrate'
Conflicts:
src/opengl/qglshaderprogram.cpp
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions