[ebook-tools/f13/master: 3/3] Merge branch 'master' into f13
Rex Dieter
rdieter at fedoraproject.org
Thu Sep 30 18:27:44 UTC 2010
commit f780ad160c9686fb67b323493c0eb4efef9c4ac8
Merge: fc950e5 7df99a0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Sep 30 13:33:11 2010 -0500
Merge branch 'master' into f13
Conflicts:
.gitignore
.gitignore | 2 +-
ebook-tools-0.1.1-rmhardcoded.patch | 11 ---------
ebook-tools-0.2.0-rmhardcoded.patch | 11 +++++++++
ebook-tools.spec | 40 ++++++++++++++++++++--------------
sources | 2 +-
5 files changed, 36 insertions(+), 30 deletions(-)
---
More information about the scm-commits
mailing list