[libunicap/f13/master: 5/5] Merge remote branch 'origin/master' into f13
Robert Scheck
robert at fedoraproject.org
Mon Oct 4 20:14:47 UTC 2010
commit 49abffda0668994b419a4a44bc106eb2ffdebcfa
Merge: be6606c d6b2540
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Oct 4 22:14:44 2010 +0200
Merge remote branch 'origin/master' into f13
Conflicts:
.gitignore
libunicap.spec
sources
.gitignore | 2 +-
libunicap-0.9.12-includes.patch | 15 +++++++++++++++
libunicap.spec | 16 ++++++++++++++--
sources | 2 +-
4 files changed, 31 insertions(+), 4 deletions(-)
---
More information about the scm-commits
mailing list