diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:35:46 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:35:46 (GMT) |
| commit | c53414e11b3f980f81a4470b3fb52f9d1aa80d56 (patch) | |
| tree | 7d51540148af638b1c4fb7cda939d34739245457 /tools/linguist/shared/formats.pri | |
| parent | f2b93868f48a3e2d6e462ca8a051ab47eefef49d (diff) | |
| parent | 304bf2ef0a99882d2d969347f85a330523086fb3 (diff) | |
| download | Qt-c53414e11b3f980f81a4470b3fb52f9d1aa80d56.zip Qt-c53414e11b3f980f81a4470b3fb52f9d1aa80d56.tar.gz Qt-c53414e11b3f980f81a4470b3fb52f9d1aa80d56.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
Diffstat (limited to 'tools/linguist/shared/formats.pri')
0 files changed, 0 insertions, 0 deletions