[zarafa/f13/master: 2/2] Merge remote branch 'origin/master' into f13
Robert Scheck
robert at fedoraproject.org
Tue Aug 31 19:21:17 UTC 2010
commit 194a11fead3e35732d7df2400010cd5dc3404900
Merge: 2f1b184 64f29bf
Author: Robert Scheck <robert at fedoraproject.org>
Date: Tue Aug 31 21:21:09 2010 +0200
Merge remote branch 'origin/master' into f13
Conflicts:
.gitignore
.gitignore | 2 +-
sources | 2 +-
zarafa-6.40.0-undefined-symbol.patch | 42 ----------------------------------
zarafa.spec | 42 ++++++++++++++++++---------------
4 files changed, 25 insertions(+), 63 deletions(-)
---
More information about the scm-commits
mailing list