[goffice/el6/master: 22/23] Merge remote branch 'origin/f14/master' into el6

Bill Nottingham notting at fedoraproject.org
Mon Jan 3 15:43:44 UTC 2011


commit 08515278f3ff2d8507024c1b9809aefdb07cca44
Merge: d4b40aa b5ab2aa
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Jan 3 10:43:25 2011 -0500

    Merge remote branch 'origin/f14/master' into el6
    
    Conflicts:
    	.gitignore

 goffice-0.6.6-backport-20090219.patch |   68 ----------------------
 goffice-0.6.6-backport-20090306.patch |   99 ---------------------------------
 goffice-0.6.6-backport-20090501.patch |   52 -----------------
 goffice.spec                          |   53 ++++++++++++-----
 sources                               |    2 +-
 5 files changed, 38 insertions(+), 236 deletions(-)
---


More information about the scm-commits mailing list