diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-27 03:52:16 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-27 05:10:06 (GMT) |
| commit | 62c33357cec8924f2383042c544636ec5aae1c97 (patch) | |
| tree | 3c1c6f975710807d10546631b58fb0c52bd2fb50 /tests/manual | |
| parent | 4b112230229544b13c254acd8a10b67939c79f22 (diff) | |
| parent | c52061e7980fcde5d59a7657a254ce00d117b611 (diff) | |
| download | Qt-62c33357cec8924f2383042c544636ec5aae1c97.zip Qt-62c33357cec8924f2383042c544636ec5aae1c97.tar.gz Qt-62c33357cec8924f2383042c544636ec5aae1c97.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'tests/manual')
0 files changed, 0 insertions, 0 deletions