[eggdrop/el6: 4/4] Merge remote branch 'origin/master' into el6

Robert Scheck robert at fedoraproject.org
Sun Jan 8 20:37:40 UTC 2012


commit 296725cc5efa7eebdb0a9116b496df6d4ebe00bf
Merge: 6257dd9 3d0d61c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jan 8 21:37:30 2012 +0100

    Merge remote branch 'origin/master' into el6

 .gitignore                                         |    2 +-
 ..._libdns.patch => eggdrop-1.6.21-no_libdns.patch |   24 +++---
 ...p0010.patch => eggdrop-1.6.21-suzi_sp0011.patch |   91 ++++++++++----------
 eggdrop.spec                                       |   25 +++++-
 sources                                            |    2 +-
 5 files changed, 80 insertions(+), 64 deletions(-)
---


More information about the scm-commits mailing list