diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-16 07:46:21 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-16 07:46:21 (GMT) |
| commit | a88c85f41a96a289450bdce672adeae0738fbd4f (patch) | |
| tree | 0296f0ebb0d18a0c87fed82387e0a564ee2b00c4 /doc/src/images/qt-embedded-opengl3.png | |
| parent | 4b76c78f62a6d76044c0df5a9be616ce5e6b6508 (diff) | |
| parent | eccddae15a5e675e3b72a72b10457a5e9ea340b7 (diff) | |
| download | Qt-a88c85f41a96a289450bdce672adeae0738fbd4f.zip Qt-a88c85f41a96a289450bdce672adeae0738fbd4f.tar.gz Qt-a88c85f41a96a289450bdce672adeae0738fbd4f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
tests/auto/tests.xml
Diffstat (limited to 'doc/src/images/qt-embedded-opengl3.png')
0 files changed, 0 insertions, 0 deletions