diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 10:39:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 10:39:16 (GMT) |
| commit | d369ae7b831744c796571aa86b5d6570b09e70e4 (patch) | |
| tree | 0ad8abef937ac3009f32b600a8e3b5644d7c637c /doc/src/development | |
| parent | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (diff) | |
| parent | 044708cb7f7fd1f2d7b18d20269422e7f3a1cb83 (diff) | |
| download | Qt-d369ae7b831744c796571aa86b5d6570b09e70e4.zip Qt-d369ae7b831744c796571aa86b5d6570b09e70e4.tar.gz Qt-d369ae7b831744c796571aa86b5d6570b09e70e4.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
Diffstat (limited to 'doc/src/development')
0 files changed, 0 insertions, 0 deletions