[botan/f12/master: 9/9] Merge branch 'master' into f12
Thomas Moschny
thm at fedoraproject.org
Sat Aug 28 21:17:32 UTC 2010
commit b0b578de8f24bcc965c26f83feb0e3d330d7c216
Merge: 2d9bf6e 0781893
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Sat Aug 28 23:16:25 2010 +0200
Merge branch 'master' into f12
Conflicts:
.gitignore
botan.spec
sources
.gitignore | 3 ++-
README.fedora | 13 +++++++++++++
botan.spec | 23 ++++++++++++++++++++---
repack.sh | 23 +++++++++++++++++++++++
sources | 2 +-
5 files changed, 59 insertions(+), 5 deletions(-)
---
More information about the scm-commits
mailing list