Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:51 +0000 (14:11 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:51 +0000 (14:11 +0100)
commit454b904f1e67d913d392abad764e6ae919bf9907
treee0b2248f7a4f1c15fa3447d724a990a2b0ddc362
parentb5bedc834561183eef36e12e83312a40ed1e0889
parent80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I70d45044c3dcb1e4da7ed9da377b77e6c0f9442b
src/androiddeployqt/main.cpp