[perl-DateTime-Format-Excel/el5/master: 8/8] Merge remote branch 'origin/master' into el5
Robert Scheck
robert at fedoraproject.org
Sun Jan 2 20:52:56 UTC 2011
commit 2b07bd1b35ec5c3dedfe827d15ca72bbcde5275e
Merge: 9318b3b 04e5088
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sun Jan 2 21:52:39 2011 +0100
Merge remote branch 'origin/master' into el5
Conflicts:
.gitignore
.gitignore | 2 +-
perl-DateTime-Format-Excel-0.2901-versioning.patch | 37 ---------
perl-DateTime-Format-Excel-0.31-versioning.patch | 48 +++++++++++
perl-DateTime-Format-Excel.spec | 83 +++++++++++---------
sources | 2 +-
5 files changed, 96 insertions(+), 76 deletions(-)
---
More information about the scm-commits
mailing list