Merge remote-tracking branch 'origin/stable' into dev dev_1401118448 dev_1401118818 dev_1401139845 dev_1401164373 32/86232/1
authorSergio Ahumada <sahumada@blackberry.com>
Mon, 26 May 2014 13:44:12 +0000 (15:44 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Mon, 26 May 2014 13:44:48 +0000 (15:44 +0200)
Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26

1  2 
qt.pro

diff --cc qt.pro
Simple merge