diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-06-06 10:25:17 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-06-06 10:25:17 (GMT) |
| commit | 71cd7dfea1b8f0e287eb1616c0cda5493508c3c4 (patch) | |
| tree | 9b0aedf6a235000164c4cb43eb3a99939611e545 /imports | |
| parent | 278c2b360aba87db2d1e5a2d3e14de7260d8a16e (diff) | |
| parent | 408a522ffa25106334c3b29a4799e0d0a1719291 (diff) | |
| download | Qt-71cd7dfea1b8f0e287eb1616c0cda5493508c3c4.zip Qt-71cd7dfea1b8f0e287eb1616c0cda5493508c3c4.tar.gz Qt-71cd7dfea1b8f0e287eb1616c0cda5493508c3c4.tar.bz2 | |
Merge remote branch 'qt/4.8' into fire-master
Conflicts:
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylandclipboard.h
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/s60installs/eabi/QtOpenGLu.def
Diffstat (limited to 'imports')
0 files changed, 0 insertions, 0 deletions