diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-19 08:39:40 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-19 08:39:40 (GMT) |
| commit | 928f902015a0ad97279ce6e2ac4cb85e5baed684 (patch) | |
| tree | c3afd6f5b72b32136ab9d40788e1cf05d7b91763 /src/opengl/qgl_p.h | |
| parent | 17d6f2a59fe2b170087cdf7074807c6a2dce1043 (diff) | |
| parent | 5fb5c01bd0ac234eaca890d97053c7b0772861a3 (diff) | |
| download | Qt-928f902015a0ad97279ce6e2ac4cb85e5baed684.zip Qt-928f902015a0ad97279ce6e2ac4cb85e5baed684.tar.gz Qt-928f902015a0ad97279ce6e2ac4cb85e5baed684.tar.bz2 | |
Merge commit 'qt/master' into kinetic-graphicseffect
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/opengl/qgl_p.h')
0 files changed, 0 insertions, 0 deletions