[redland/f14/master: 4/4] Merge branch 'master' into f14

Orcan Ogetbil oget at fedoraproject.org
Sun Oct 3 06:25:04 UTC 2010


commit df643278b0c4f541d8198c786930dd9ae38fd35a
Merge: bf99fd2 47b9ba5
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Oct 3 02:17:29 2010 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	redland.spec

 .gitignore                                      |    1 +
 redland-1.0.10-linking.patch                    |   33 -------
 redland-1.0.10-no_undefined.patch               |   33 -------
 redland-1.0.10-pkgconfig_requires_private.patch |   13 ---
 redland-1.0.11-linking.patch                    |  107 +++++++++++++++++++++++
 redland.spec                                    |   18 ++--
 sources                                         |    2 +-
 7 files changed, 119 insertions(+), 88 deletions(-)
---


More information about the scm-commits mailing list