3b8888 Merge branch 'f18' into f17

Merged and Committed by rdieter 7 years ago
    Merge branch 'f18' into f17
    
    Conflicts:
    	qt.spec
    
        
file modified
+1 -10
qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch
file renamed
+7 -7
qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch
file renamed
+4 -4
file modified
+30 -27
file modified
+1 -1