diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-25 11:48:13 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-25 11:48:13 (GMT) |
| commit | cd43f2dabaf157efbb52d2ecf57f049e0733910c (patch) | |
| tree | 0fe861c8d4a7a9bc7c5e19d3e3f149bedf4aa6a0 /doc/src/snippets/code | |
| parent | a0da99611734651f8ad4de3090f7ab05c2b2f9c1 (diff) | |
| parent | be99c17beae01fbc0eabe6f0cfa4b09ebbaa9dbb (diff) | |
| download | Qt-cd43f2dabaf157efbb52d2ecf57f049e0733910c.zip Qt-cd43f2dabaf157efbb52d2ecf57f049e0733910c.tar.gz Qt-cd43f2dabaf157efbb52d2ecf57f049e0733910c.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Conflicts:
src/opengl/qpixmapdata_symbiangl.cpp
Diffstat (limited to 'doc/src/snippets/code')
0 files changed, 0 insertions, 0 deletions