[lbzip2/el4: 11/11] Merge branch 'master' into el4
lzap
lzap at fedoraproject.org
Mon Aug 20 08:54:45 UTC 2012
commit a79ae173b90746dc1ead4b6e1583b093222726fe
Merge: ed42415 fce9c0d
Author: Laszlo Ersek <lersek at redhat.com>
Date: Fri Aug 17 22:30:06 2012 +0200
Merge branch 'master' into el4
Conflicts:
lbzip2-makefile.patch
lbzip2.spec
.gitignore | 4 ++
lbzip2-lfs.patch | 15 --------
lbzip2-makefile.patch | 48 --------------------------
lbzip2.spec | 90 +++++++++++++++++++++++-------------------------
sources | 2 +-
5 files changed, 48 insertions(+), 111 deletions(-)
---
More information about the scm-commits
mailing list