[orc/f16: 6/6] Merge branch 'master' into f16
Fabian Deutsch
fabiand at fedoraproject.org
Sun Jan 8 16:06:45 UTC 2012
commit 6395c93c6c22c6367cfae7eeba761e1c32f8c647
Merge: a847606 a401f84
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date: Sun Jan 8 17:05:47 2012 +0100
Merge branch 'master' into f16
Conflicts:
orc.spec
Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>
orc-subdir.patch | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
orc.spec | 7 ++-
2 files changed, 136 insertions(+), 5 deletions(-)
---
More information about the scm-commits
mailing list