[ksnapshot/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16
Rex Dieter
rdieter at fedoraproject.org
Thu Mar 8 06:48:49 UTC 2012
commit 43147181b4f6e17dfd7869f8ae4a688d922bea7c
Merge: 91a52d0 797c4f4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Mar 8 00:50:19 2012 -0600
Merge remote-tracking branch 'origin/f17' into f16
Conflicts:
.gitignore
ksnapshot.spec
sources
.gitignore | 3 +--
ksnapshot.spec | 31 ++++++++++++++++++++++++++-----
sources | 2 +-
3 files changed, 28 insertions(+), 8 deletions(-)
---
More information about the scm-commits
mailing list