diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 10:55:09 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 10:55:09 (GMT) |
commit | b2d8bca28e1ea485c9ebbe02566cc099c33d8458 (patch) | |
tree | 3b6bcb0107d2c78491a92ca81b4d5a0e052135ed /src/gui | |
parent | 287a8d25b0e13602d02abc301e64060f46fff0e9 (diff) | |
parent | ca51a4aab9f6b91b034a3b269718165b56883285 (diff) | |
download | Qt-b2d8bca28e1ea485c9ebbe02566cc099c33d8458.zip Qt-b2d8bca28e1ea485c9ebbe02566cc099c33d8458.tar.gz Qt-b2d8bca28e1ea485c9ebbe02566cc099c33d8458.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Allow attributes to be bound after a QGLShaderProgram is linked.
Diffstat (limited to 'src/gui')
0 files changed, 0 insertions, 0 deletions