[kdebindings/f13/master: 52/52] Merge remote branch 'origin/f14/master' into f13/master

Rex Dieter rdieter at fedoraproject.org
Fri Oct 22 11:37:47 UTC 2010


commit 5abb82c8ec1b9704f37e833a3152c311d16f8221
Merge: 085f305 5b5df96
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 06:43:46 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdebindings.spec
    	sources

 .gitignore                                      |    2 +-
 kdebindings-4.3.75-no-rpath.patch               |   24 ----
 kdebindings-4.5.1-sip_api_8.patch               |   65 +++++++++
 kdebindings-4.5.2-generator-invalid-reads.patch |   37 +++++
 kdebindings.spec                                |  161 ++++++++++++++---------
 sources                                         |    2 +-
 6 files changed, 203 insertions(+), 88 deletions(-)
---


More information about the scm-commits mailing list