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

[Erik van Pienbroek]

commit 70a02dbd6ee6046ca2fa01a3f7685c5d0f6b432b
Merge: 5faa833 6c4afda
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Jul 6 11:42:43 2014 +0200

    Merge branch 'master' into epel7

 .gitignore                             |    1 +
 mingw-qt5-qtbase.spec                  |   12 +++++++++---
 qt5-enable-rpath-for-host-tools.patch  |    4 ++--
 qt5-rename-qtmain-to-qt5main.patch     |    8 ++++----
 qt5-use-system-zlib-in-host-libs.patch |    6 +++---
 sources                                |    2 +-
 6 files changed, 20 insertions(+), 13 deletions(-)
---