[superiotool/el6/master: 7/7] Merge branch 'master' into el6/master
Peter Lemenkov
peter at fedoraproject.org
Mon Aug 16 14:30:27 UTC 2010
commit 7df6e1f8b0d824a95daa36fed35a13856116c2ea
Merge: da5a7b8 68d65ee
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Aug 16 18:30:07 2010 +0400
Merge branch 'master' into el6/master
Conflicts:
sources
superiotool.spec
sources | 2 +-
...iff => superiotool-0001-Makefile-cleanups.patch | 27 ++++++++++++++-----
superiotool.spec | 14 +++++++---
3 files changed, 31 insertions(+), 12 deletions(-)
---
More information about the scm-commits
mailing list