Two more merge fixes
authorHarald Fernengel <harald.fernengel@nokia.com>
Wed, 3 Nov 2010 10:04:19 +0000 (11:04 +0100)
committerHarald Fernengel <harald.fernengel@nokia.com>
Wed, 3 Nov 2010 10:04:49 +0000 (11:04 +0100)
commite1da8161cf8c78bbcf68b97a02a97f4bd8a84dc3
tree5ed93a649d635ad1ebdf3b4e16c2aeb77bf4928a
parentbc402358b86ed81635914ecd0b5b8a86e7449877
Two more merge fixes
src/gui/styles/qgtkstyle.cpp
src/gui/util/qdesktopservices_x11.cpp