Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
authorGunnar Sletta <gunnar@trolltech.com>
Thu, 21 Jan 2010 06:59:53 +0000 (07:59 +0100)
committerGunnar Sletta <gunnar@trolltech.com>
Thu, 21 Jan 2010 06:59:53 +0000 (07:59 +0100)
commit5c0d077659e8cb2b78dd96f8c629d8512c583d13
tree320a11ecb6579ba9691d5e9a43cb51dcd91dcc7b
parent4248244704211a45a20a39f390ec00c9687a8d1c
parent513d6bd7388e27f32b2868ded6174ca84212cd1b
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
src/gui/kernel/qapplication_mac.mm