[mingw-qt5-qtbase/epel7: 3/3] Merge branch 'master' into epel7

[Erik van Pienbroek]

commit e1e645d8695c55630db842d0138d353526ce7449
Merge: 70a02db 2585cb2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Jul 24 00:43:55 2014 +0200

    Merge branch 'master' into epel7

 mingw-qt5-qtbase.spec                        |   19 ++++++++++++++++++-
 qt5-workaround-gcc48-arm-build-failure.patch |   11 +++++++++++
 2 files changed, 29 insertions(+), 1 deletions(-)
---