Fixed the merge
authorClaudio Valerio <claudio@open-sankore.org>
Tue, 6 Mar 2012 14:29:11 +0000 (15:29 +0100)
committerClaudio Valerio <claudio@open-sankore.org>
Tue, 6 Mar 2012 14:29:11 +0000 (15:29 +0100)
commitfd8934afeabf889c7b76d3f380bb201a640bed4b
tree0ecd152b04ecc60cb388559240a7378b6dfacf0d
parent1d1c6d39ab397aa9f9dff80e98e3075ded0dd1e4
Fixed the merge
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qt_mac_p.h