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