[qt5-qtbase: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/qt5-qtbase

[Rex Dieter]

commit 5d6be197aa942776553ceb29e6047b15e0aeca51
Merge: c242367 d299f75
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Nov 3 17:44:43 2014 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/qt5-qtbase

 macros.qt5      |   30 ++++++++++++++++++++++++++++++
 qt5-qtbase.spec |   38 ++++++++++++++------------------------
 2 files changed, 44 insertions(+), 24 deletions(-)
---