diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-08 12:12:17 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-08 12:12:17 (GMT) |
| commit | 21fef75cd50b00609a803f123cc27ad0ee9ba509 (patch) | |
| tree | ca96462e89b9c4828c7792e62def95e77d69d277 /LICENSE.GPL3 | |
| parent | 11303c676166cda3aae33e7e97939e9d2942271f (diff) | |
| parent | 61d1dcea0efa6b0809639b781bb49baf252b3aad (diff) | |
| download | Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.zip Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.tar.gz Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
Diffstat (limited to 'LICENSE.GPL3')
0 files changed, 0 insertions, 0 deletions