commit 34a89fc762c5460d0937031ae32c55b8429cbed0
Merge: 368d1e7 f2a174f
Author: Robert Scheck <robert(a)fedoraproject.org>
Date: Fri Dec 31 23:27:30 2010 +0100
Merge remote branch 'origin/master' into el4
Conflicts:
.gitignore
lzop.spec
sources
.gitignore | 2 +-
lzop.spec | 79 +++++++++++++++++++++++++++++++++++-------------------------
sources | 2 +-
3 files changed, 48 insertions(+), 35 deletions(-)
---
Show replies by date