[libvmime07/el4/master: 8/8] Merge remote branch 'origin/master' into el4
Robert Scheck
robert at fedoraproject.org
Sun Oct 31 19:17:16 UTC 2010
commit 0919e8fc6e7e72413f2c23ec16de9837fb6ed9a9
Merge: 2f6fd10 2122e55
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sun Oct 31 20:17:11 2010 +0100
Merge remote branch 'origin/master' into el4
Conflicts:
libvmime07-0.7.1-allow-alternate-encodings.patch
libvmime07.spec
libvmime07-0.7.1-allow-alternate-encodings.patch | 18 +++++++++++++++---
libvmime07.spec | 5 ++++-
2 files changed, 19 insertions(+), 4 deletions(-)
---
More information about the scm-commits
mailing list