Merge branch 'master' of git:qt/oslo-staging-2
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 07:56:54 +0000 (09:56 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 07:56:54 +0000 (09:56 +0200)
commit1ffc19d083a82c3f717e4f091a3af7b0241b6a6d
treeeefe2453f2eac59051c6897398b3315a5e7a9a19
parenta7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba
parenteb7fad0afd164bb9b56ed47990eaa66cad0c2641
Merge branch 'master' of git:qt/oslo-staging-2

Conflicts:
src/gui/painting/qtextureglyphcache.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/painting/qtextureglyphcache.cpp
src/gui/styles/qmacstyle_mac.mm