Merge remote-tracking branch 'origin/5.3' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 22:30:37 +0000 (00:30 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 22:30:37 +0000 (00:30 +0200)
commit8450ae02bb16521948199f96872536cacedb5456
tree44051087b9b88b747b09ed0d30f1616fc9a3c816
parentdd7f6b83e80f6b16a6e53f2ba4dbea2f8d674837
parent7017fe8165c84ba6e9388810d3cc946c9df04dc0
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: I9580b6fee5533456feeed20045327c3746a73240
src/androiddeployqt/main.cpp
src/windeployqt/main.cpp