Merge branch '4.5' into 4.6-staging
authorThiago Macieira <thiago.macieira@nokia.com>
Sat, 26 Dec 2009 19:38:46 +0000 (20:38 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Sat, 26 Dec 2009 19:38:46 +0000 (20:38 +0100)
commit1a1eeba0086d764474546da7fe443bf210d4d974
tree8d42fbce05e87c2908fcec8572a61c6501be5f15
parent63bd10ae61ed0b877344b217e57eb87f77256e98
parent53abbf0cedbf2e3478e63c1b007d27a943df630d
Merge branch '4.5' into 4.6-staging

Conflicts:
tests/benchmarks/benchmarks.pro
src/gui/image/qppmhandler.cpp
src/opengl/qpaintengine_opengl.cpp
tests/benchmarks/benchmarks.pro