[superiotool/f13/master: 5/5] Merge branch 'master' into f13/master
Peter Lemenkov
peter at fedoraproject.org
Mon Aug 16 14:04:14 UTC 2010
commit 3578048da35af0779a4798fe74667e8361dca88d
Merge: 37a3a95 68d65ee
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Aug 16 18:04:04 2010 +0400
Merge branch 'master' into f13/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