diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-11 16:34:48 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-11 16:34:48 (GMT) |
| commit | 319f4f07c80664d6e244daf22d9b4c13e5d4e69a (patch) | |
| tree | 60c2b9b1462eab6eab6a15f541fe361c7a878eab /LGPL_EXCEPTION.txt | |
| parent | ccb838e6d4e661c9280d5c69fa0b1717b85a1dd9 (diff) | |
| parent | 8dca92fd7987a9aa727dea6c367c079a39668f09 (diff) | |
| download | Qt-319f4f07c80664d6e244daf22d9b4c13e5d4e69a.zip Qt-319f4f07c80664d6e244daf22d9b4c13e5d4e69a.tar.gz Qt-319f4f07c80664d6e244daf22d9b4c13e5d4e69a.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/gui/kernel/qt_s60_p.h
src/opengl/qglextensions.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/mediaobject/tst_mediaobject.cpp
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions