| commit | 2e0ba7333993c417fd4871a977c4d787e344692c | |
| author | Thiago Macieira <thiago.macieira@nokia.com> | |
| Fri, 9 Oct 2009 16:34:24 +0000 (9 18:34 +0200) | ||
| committer | Thiago Macieira <thiago.macieira@nokia.com> | |
| Fri, 9 Oct 2009 16:34:24 +0000 (9 18:34 +0200) | ||
| tree | 967ef1c2b3416477d25b7a256490c271ab5259fc | treesnapshot (tar.gz zip) |
| parent | 30bd59a1dec78e3b8bb9bbbc4f129663efa169a6 | commitdiff |
| parent | 85bb10256b2745499f04c32a5ed738889606f6c3 | commitdiff |
Merge branch '4.5' into 4.6
Conflicts:
src/opengl/qglpixelbuffer_egl.cpp
Conflicts:
src/opengl/qglpixelbuffer_egl.cpp