[kgamma/f17: 9/9] Merge branch 'master' into f17
Rex Dieter
rdieter at fedoraproject.org
Mon Sep 10 12:30:11 UTC 2012
commit 148c1e67f8da585eae8bcd32dbc98829c764cc31
Merge: 70d0e1c ee32816
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Sep 10 07:34:04 2012 -0500
Merge branch 'master' into f17
Conflicts:
.gitignore
kgamma.spec
sources
.gitignore | 3 +--
kgamma.spec | 25 ++++++++++++++++++++-----
sources | 2 +-
3 files changed, 22 insertions(+), 8 deletions(-)
---
More information about the scm-commits
mailing list