diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-23 22:54:54 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-23 22:54:54 (GMT) |
commit | 2d868c78f3da4757188cf014b2dac9d8a75f9991 (patch) | |
tree | 04894580c93cb1885105d6a59697f3f45ddb7531 /src/gui/kernel/qclipboard.h | |
parent | 787f2252077434581101df64d0f0d576c26b7ce8 (diff) | |
parent | b31186b720d239daad69c49d8a862dce4e301d5d (diff) | |
download | Qt-2d868c78f3da4757188cf014b2dac9d8a75f9991.zip Qt-2d868c78f3da4757188cf014b2dac9d8a75f9991.tar.gz Qt-2d868c78f3da4757188cf014b2dac9d8a75f9991.tar.bz2 |
Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shaders
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/gui/kernel/qclipboard.h')
0 files changed, 0 insertions, 0 deletions