Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 9 Oct 2014 16:09:54 +0000 (18:09 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 9 Oct 2014 16:09:55 +0000 (18:09 +0200)
commit969931d2f26f2792fab0d2a9191265c1dadc6476
treef60d4fd061b8a30d86acf2ce8a4cfea2f8d179ba
parent7dfda6f5f91a0eb81a51ff305f79b2fe791f206a
parent9e9149e19d52fd4985548c913b0227a49326fd30
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ie652f78d8dc47ccaa3628205592a17045badef7f
src/macdeployqt/shared/shared.cpp