diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-29 13:46:13 (GMT) |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-29 13:46:13 (GMT) |
commit | 24f041b30f576a2f6ca1cd9e07cba91fc32fac59 (patch) | |
tree | f068c9beff2b5c38863cc00092e748552501ebe0 /.commit-template | |
parent | 07c2b17276057a8b47c3be57ab7c2cf66dac0edd (diff) | |
download | Qt-24f041b30f576a2f6ca1cd9e07cba91fc32fac59.zip Qt-24f041b30f576a2f6ca1cd9e07cba91fc32fac59.tar.gz Qt-24f041b30f576a2f6ca1cd9e07cba91fc32fac59.tar.bz2 |
Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0edd
Makes QGraphicsShaderEffect compatible with the new QGraphicsEffect API.
Diffstat (limited to '.commit-template')
0 files changed, 0 insertions, 0 deletions