diff options
author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-12-14 11:59:45 (GMT) |
---|---|---|
committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-12-14 11:59:45 (GMT) |
commit | a79e7519a8109ac9065f1c3ed017c56c6e2d0810 (patch) | |
tree | cca43017c85be2b845867fec42e459c39f479a21 /src/opengl/qgraphicsshadereffect_p.h | |
parent | 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f (diff) | |
parent | e864a530a5c48459c433518ff6ad893f33ec93d8 (diff) | |
download | Qt-a79e7519a8109ac9065f1c3ed017c56c6e2d0810.zip Qt-a79e7519a8109ac9065f1c3ed017c56c6e2d0810.tar.gz Qt-a79e7519a8109ac9065f1c3ed017c56c6e2d0810.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Diffstat (limited to 'src/opengl/qgraphicsshadereffect_p.h')
0 files changed, 0 insertions, 0 deletions