diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 08:46:26 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 08:46:26 (GMT) |
| commit | be3916b7e4e8007394cbed40484ef6b696e90f2b (patch) | |
| tree | a66dc85f3900e08a040f0d80eb0e56f43a163efc /src/opengl/qgl.h | |
| parent | ed24cd82444faeeda0a171a9082808ebb667e092 (diff) | |
| parent | 389c4fdebe681eb3af5a2431c390323f52a03c17 (diff) | |
| download | Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.zip Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.gz Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
Diffstat (limited to 'src/opengl/qgl.h')
0 files changed, 0 insertions, 0 deletions