diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-29 07:54:44 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-29 07:54:44 (GMT) |
| commit | dcaad8949ea1c1782d27b038f08e9a728c8e3fe5 (patch) | |
| tree | 3cb49a22f79c5952de4e913146659990d614cd64 /dist/changes-4.5.0-garden | |
| parent | 917e4e3284a568eecfca26365cc0a545d0f4eb70 (diff) | |
| parent | 6940070adb45d67a0a9186205a4914a0a6c14135 (diff) | |
| download | Qt-dcaad8949ea1c1782d27b038f08e9a728c8e3fe5.zip Qt-dcaad8949ea1c1782d27b038f08e9a728c8e3fe5.tar.gz Qt-dcaad8949ea1c1782d27b038f08e9a728c8e3fe5.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
All EGL-related changes from 4.6 were discarded.
Conflicts:
src/gui/egl/egl.pri
src/gui/egl/qegl.cpp
src/gui/egl/qegl_p.h
src/gui/egl/qegl_stub.cpp
src/gui/egl/qeglproperties_p.h
src/gui/egl/qeglproperties_stub.cpp
src/gui/gui.pro
src/multimedia/multimedia/audio/qaudioinput_win32_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'dist/changes-4.5.0-garden')
0 files changed, 0 insertions, 0 deletions