diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-07 14:12:04 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-07 14:12:04 (GMT) |
| commit | 5f8ef6ac44e1db842003deeed6525eea70d8d83d (patch) | |
| tree | 2b67b2abe7038e97fc72967a4882bf15c38d39a1 /src/gui/painting | |
| parent | d7dd967d4a4775e70d270dbcd0623ef07128d420 (diff) | |
| parent | 62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc (diff) | |
| download | Qt-5f8ef6ac44e1db842003deeed6525eea70d8d83d.zip Qt-5f8ef6ac44e1db842003deeed6525eea70d8d83d.tar.gz Qt-5f8ef6ac44e1db842003deeed6525eea70d8d83d.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msbuild_objectmodel.h
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/arch/qatomic_arm.h
tests/auto/qglthreads/tst_qglthreads.cpp
Diffstat (limited to 'src/gui/painting')
0 files changed, 0 insertions, 0 deletions