Merge error
authorTobias Nätterlund <tobias.naetterlund@kdab.com>
Wed, 16 May 2012 12:05:32 +0000 (14:05 +0200)
committerTobias Nätterlund <tobias.naetterlund@kdab.com>
Wed, 16 May 2012 12:05:32 +0000 (14:05 +0200)
commit584bafce2c83c2d9bff3f547cc0e95d771e5c24b
treeabeb366d39e6e49d69444506c8dc09eecc4cf01e
parent8050b8fb75bb9d48b9ca75a5059c3bc8dde8f25e
Merge error
src/plugins/qnx/qnx.pro