diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-30 13:49:41 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-30 13:49:41 (GMT) |
| commit | 5cd971bb508e1288573d32a996183f3e9359c90e (patch) | |
| tree | 2617b30b5cfeeedf3b63a7c3251779766fc1276f /src/gui/painting/qdrawhelper_neon.cpp | |
| parent | e8c01ab0e5fb6134617a69d88ed0cbce24a33da5 (diff) | |
| parent | ab794fe3a0d2992d770c09527c479a563f21164e (diff) | |
| download | Qt-5cd971bb508e1288573d32a996183f3e9359c90e.zip Qt-5cd971bb508e1288573d32a996183f3e9359c90e.tar.gz Qt-5cd971bb508e1288573d32a996183f3e9359c90e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
tests/auto/qpainter/tst_qpainter.cpp
Diffstat (limited to 'src/gui/painting/qdrawhelper_neon.cpp')
0 files changed, 0 insertions, 0 deletions