[kimono/f17: 9/9] Merge branch 'master' into f17
Rex Dieter
rdieter at fedoraproject.org
Mon Sep 10 12:36:10 UTC 2012
commit 6906db56b998751c0127a85d157a5d5f51032c54
Merge: e67f017 4ec009e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Sep 10 07:39:54 2012 -0500
Merge branch 'master' into f17
Conflicts:
.gitignore
kimono.spec
sources
.gitignore | 3 +--
kimono.spec | 25 ++++++++++++++++++++-----
sources | 2 +-
3 files changed, 22 insertions(+), 8 deletions(-)
---
More information about the scm-commits
mailing list