diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-20 06:08:11 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-20 06:08:11 (GMT) |
| commit | 3b688b3d3acc740a9941d6240f9e4c83c04847a7 (patch) | |
| tree | 3fa1c078471bafe12b42d6e4be21da1de90684fd /doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp | |
| parent | 4faf461051c72fe42b180dab3e048810304eec16 (diff) | |
| parent | 3cfba122843d64bb6761808c020b27c231dad8be (diff) | |
| download | Qt-3b688b3d3acc740a9941d6240f9e4c83c04847a7.zip Qt-3b688b3d3acc740a9941d6240f9e4c83c04847a7.tar.gz Qt-3b688b3d3acc740a9941d6240f9e4c83c04847a7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/QmlChanges.txt
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp')
0 files changed, 0 insertions, 0 deletions