[fedora-packager/el6/master: 4/4] Merge branch 'master' into el6
Dennis Gilmore
ausil at fedoraproject.org
Sun Oct 10 18:07:05 UTC 2010
commit 5c1399221d0b5ef1200a241d89e464e27356edb4
Merge: 9e2969a c815775
Author: Dennis Gilmore <dennis at ausil.us>
Date: Sun Oct 10 13:06:57 2010 -0500
Merge branch 'master' into el6
Conflicts:
fedora-packager.spec
...-missing-process-call-for-non-pipe-no-tty.patch | 28 ------
0001-add-fedora-burn-yubikey-script.patch | 96 ++++++++++++++++++++
...-install-fedora-burn-yubikey-into-sbindir.patch | 46 ++++++++++
...and-copyright-info-for-fedora-burn-yubike.patch | 31 +++++++
fedora-packager.spec | 36 +++++++-
5 files changed, 206 insertions(+), 31 deletions(-)
---
More information about the scm-commits
mailing list