Merge remote-tracking branch 'origin/release' into stable
authorIikka Eklund <iikka.eklund@digia.com>
Tue, 20 May 2014 10:27:07 +0000 (13:27 +0300)
committerIikka Eklund <iikka.eklund@digia.com>
Tue, 20 May 2014 10:27:07 +0000 (13:27 +0300)
commit1417a660f0bc02b5ac2e88af4bfef99544be9c45
treeb33c51b4c1a8ca46ede372220d9a65887679f753
parent3f24e2cc5bfc9fac7c1cfd6ab0dc9b0880e879ea
parent16ee0c0f9e58f9db9d8b261fbe63560f631c0597
Merge remote-tracking branch 'origin/release' into stable

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