diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-07-28 10:25:55 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-07-28 12:19:18 (GMT) |
| commit | dbdc54791e585f3c6bf62c1a091ef844a66483ba (patch) | |
| tree | 75b5f14c4b1a8176b53b23d93f0b6f7dcc688365 /src/gui/image/qpictureformatplugin.cpp | |
| parent | 610aa1737a206fe97628a3375a543400ea0761fa (diff) | |
| parent | 0431548ddffc56f74cc60e7d341ade3920adefb1 (diff) | |
| download | Qt-dbdc54791e585f3c6bf62c1a091ef844a66483ba.zip Qt-dbdc54791e585f3c6bf62c1a091ef844a66483ba.tar.gz Qt-dbdc54791e585f3c6bf62c1a091ef844a66483ba.tar.bz2 | |
Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffect
Conflicts:
src/opengl/gl2paintengineex/qglengineshadermanager.cpp
src/opengl/gl2paintengineex/qglengineshadermanager_p.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
Merge custom shader / GL blur pixmap filter implementation from graphics
team repo with implementation from kinetic graphics-team repo.
Diffstat (limited to 'src/gui/image/qpictureformatplugin.cpp')
0 files changed, 0 insertions, 0 deletions