[bitlbee/f14: 11/11] Merge branch 'master' into f14
Matej Cepl
mcepl at fedoraproject.org
Tue Jul 26 10:57:47 UTC 2011
commit 5ce2cde1a49ed29dadeb8f6149ce88f8600b5df4
Merge: cbe7f6d d76f62d
Author: Matěj Cepl <mcepl at redhat.com>
Date: Tue Jul 26 12:57:21 2011 +0200
Merge branch 'master' into f14
.gitignore | 2 +
bitlbee-des3-implement.patch | 16 ++--
bitlbee-forkdaemon.patch | 7 +-
bitlbee-installP.patch | 33 +++-----
bitlbee-libresolv.patch | 18 +++--
bitlbee-ssl_pending.patch | 19 -----
bitlbee-syslibdirs.patch | 9 +-
bitlbee-systemd.patch | 178 ++++--------------------------------------
bitlbee.spec | 96 +++++++++++++++++------
sources | 2 +-
10 files changed, 130 insertions(+), 250 deletions(-)
---
More information about the scm-commits
mailing list