[fuse/f12/master: 7/7] Merge branch 'master' into f12/master
Peter Lemenkov
peter at fedoraproject.org
Tue Oct 26 11:16:33 UTC 2010
commit 806d5c0989f9c522ed1d81bb732a660d1fe768f1
Merge: 8af9808 8357eb9
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Oct 26 15:16:20 2010 +0400
Merge branch 'master' into f12/master
Conflicts:
.gitignore
fuse.spec
sources
.gitignore | 1 +
fuse.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
More information about the scm-commits
mailing list