[bitlbee/el6/master: 12/12] Merge branch 'master' into el6
Matej Cepl
mcepl at fedoraproject.org
Fri Oct 22 13:01:59 UTC 2010
commit d3fbd4ef363de3cf6ecea8f26c02afa105d8d914
Merge: 12c61f7 89da42f
Author: Matěj Cepl <mcepl at redhat.com>
Date: Fri Oct 22 15:01:51 2010 +0200
Merge branch 'master' into el6
Conflicts:
.gitignore
bitlbee-1.2.7-libresolv.patch
bitlbee.spec
sources
.gitignore | 1 +
bitlbee-1.2.7-libresolv.patch | 434 -----------------------------------------
bitlbee.spec | 15 +-
sources | 2 +-
4 files changed, 10 insertions(+), 442 deletions(-)
---
More information about the scm-commits
mailing list