diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 16:34:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 16:34:24 (GMT) |
| commit | 2e0ba7333993c417fd4871a977c4d787e344692c (patch) | |
| tree | 967ef1c2b3416477d25b7a256490c271ab5259fc | |
| parent | 30bd59a1dec78e3b8bb9bbbc4f129663efa169a6 (diff) | |
| parent | 85bb10256b2745499f04c32a5ed738889606f6c3 (diff) | |
| download | Qt-2e0ba7333993c417fd4871a977c4d787e344692c.zip Qt-2e0ba7333993c417fd4871a977c4d787e344692c.tar.gz Qt-2e0ba7333993c417fd4871a977c4d787e344692c.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/opengl/qglpixelbuffer_egl.cpp
0 files changed, 0 insertions, 0 deletions