diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-10-31 15:03:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-10-31 15:03:00 +0100 |
| commit | 8da9881989ca55f7d5e9e74c91e3abc98ce8a1b5 (patch) | |
| tree | f8ea3bac554266d7f74cf5495dc2de4c6a524c58 /src/imports/shaders/shadereffect.cpp | |
| parent | cf5695691682957b68b67fd951addf4a52bfba84 (diff) | |
| parent | da8a056dbb0e4b0a65d94857cdd65ddcb8633341 (diff) | |
| download | qt4-tools-8da9881989ca55f7d5e9e74c91e3abc98ce8a1b5.tar.gz | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/mainpage.qdoc
doc/src/platforms/supported-platforms.qdoc
doc/src/qt-webpages.qdoc
src/network/access/qnetworkdiskcache.cpp
Diffstat (limited to 'src/imports/shaders/shadereffect.cpp')
0 files changed, 0 insertions, 0 deletions