[git/f13/master: 2/2] Merge remote branch 'origin/master' into f13
Adam Tkac
atkac at fedoraproject.org
Tue Sep 7 09:18:32 UTC 2010
commit c3925e90200f4e24d8b46ea287a65337731097db
Merge: 9b9ee67 d5dd393
Author: Adam Tkac <atkac at redhat.com>
Date: Tue Sep 7 11:16:58 2010 +0200
Merge remote branch 'origin/master' into f13
Conflicts:
.gitignore
Signed-off-by: Adam Tkac <atkac at redhat.com>
.gitignore | 4 +++-
git.spec | 5 ++++-
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
More information about the scm-commits
mailing list