[superiotool/el4/master: 25/25] Merge branch 'master' into el4/master
Peter Lemenkov
peter at fedoraproject.org
Mon Aug 16 14:33:34 UTC 2010
commit 80297013cd3e2930b5e3ae6dd9ad14e471f8a3dc
Merge: 1f0507b 68d65ee
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Aug 16 18:33:18 2010 +0400
Merge branch 'master' into el4/master
Conflicts:
sources
superiotool.spec
sources | 2 +-
superiotool-0001-Makefile-cleanups.patch | 46 ++++++++++++++++++++++++++++++
superiotool.spec | 14 ++++++--
3 files changed, 57 insertions(+), 5 deletions(-)
---
More information about the scm-commits
mailing list