| commit | 1433a2c8682cb1c8f89ceaf97ad7a509ac686879 | |
| author | Thiago Macieira <thiago.macieira@nokia.com> | |
| Fri, 16 Oct 2009 16:24:19 +0000 (16 18:24 +0200) | ||
| committer | Thiago Macieira <thiago.macieira@nokia.com> | |
| Fri, 16 Oct 2009 16:24:19 +0000 (16 18:24 +0200) | ||
| tree | dc2e5de107f030c3b946219d8614c8b5d42454ff | treesnapshot (tar.gz zip) |
| parent | bb3bfd01c1e8797a5a6c5ba553deca11c5ad246c | commitdiff |
| parent | e7a92a1b9ff31cf036982bee1221d7e7cb3aea6a | commitdiff |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/egl/qegl_symbian.cpp
Conflicts:
src/gui/egl/qegl_symbian.cpp
| src/network/kernel/qnetworkproxy_win.cpp | diff1 | diff2 | blobhistory |