Merge remote-tracking branch 'origin/2.5'
authorEike Ziller <eike.ziller@nokia.com>
Wed, 14 Mar 2012 08:33:25 +0000 (09:33 +0100)
committerEike Ziller <eike.ziller@nokia.com>
Wed, 14 Mar 2012 08:33:25 +0000 (09:33 +0100)
commit63f0c0a62f6ee95d1919bf29b0d56da924021ae3
tree4a445855bf2ba69caefa29e0d5382bfe9d815250
parent489feeae159f0ea9ab591fc80b52aad55d6b0b3e
parentb91f4700f8a6ee787f7e5915adfaad3254fdfe0c
Merge remote-tracking branch 'origin/2.5'

Conflicts:
qtcreator.pri

Change-Id: Ic24b756b41d2a13f3d696dee69553d2c3241ab95