Commit - rpms/kdelibs - 03eeceb69c9c23f2e6fb629528033bb06cdd6c7a

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdelibs-solid_qt_no_debug_output.patch
    	kdelibs-udisks2-backend.patch
    	kdelibs.spec
    	sources

.gitignore

file modified

+1 -1

kdelibs-4.1.70-cmake.patch

file removed

-11

kdelibs-4.10.0-CVE-2009-2702.patch ~~kdelibs-4.3.1-CVE-2009-2702.patch~~

file renamed

+14 -14

kdelibs-4.10.0-SOLID_UPNP.patch ~~kdelibs-4.7.4-SOLID_UPNP.patch~~

file renamed

+4 -4

kdelibs-4.10.0-branding.patch ~~kdelibs-4.6.80-branding.patch~~

file renamed

+5 -5

kdelibs-4.10.0-cmake.patch

file added

+11

kdelibs-4.10.0-kde149705.patch ~~kdelibs-4.2.85-kde149705.patch~~

file renamed

+11 -11

kdelibs-4.10.0-kstandarddirs.patch ~~kdelibs-4.6.90-kstandarddirs.patch~~

file renamed

+5 -5

kdelibs-4.10.0-no_rpath.patch ~~kdelibs-4.5.80-no_rpath.patch~~

file renamed

+7 -7

kdelibs-4.10.0-webkit.patch ~~kdelibs-4.8.3-webkit.patch~~

file renamed

+19 -19

kdelibs-4.10.0-xdg-menu.patch ~~kdelibs-4.1.0-xdg-menu.patch~~

file renamed

+5 -5

kdelibs-4.6.2-uri_mimetypes.patch

file removed

-110

kdelibs-4.7.3-halectomy.patch

file removed

-104

kdelibs-4.9.1-FindKipi-libkipi2.patch

file removed

-224

kdelibs-4.9.2-FindSamba_samba4.patch

file removed

-28

kdelibs-4.9.90-FindSamba_samba4.patch

file added

+26

kdelibs-4.9.95-parallel_devel.patch ~~kdelibs-4.5.80-parallel_devel.patch~~

file renamed

+30 -30

kdelibs-4.9.97-libexecdir.patch ~~kdelibs-4.8.0-libexecdir.patch~~

file renamed

+10 -21

kdelibs-FindKdcraw.patch

file removed

-246

kdelibs-cmake_python3.patch

file removed

-29

kdelibs-solid_qt_no_debug_output.patch

file modified

+22 -7

kdelibs-udisks2-backend.patch

file removed

-4068

kdelibs-udisks2_2_stage.patch

file removed

-14

kdelibs.spec

file modified

+76 -339

sources

file modified

+1 -1

rpms / kdelibs

Source Code

03eeceb Merge branch 'master' into f18

Merged and Committed by Rex Dieter 11 years ago

`03eeceb` Merge branch 'master' into f18