Merge branch 'f19' into f18

Merge branch 'master' into f18
Signed-off-by: Adam Jackson <ajax@redhat.com> Conflicts: llvm.spec
2013-05-28 15:15:28 -04:00 · 2013-03-13 10:50:06 -04:00 · 2013-02-20 17:43:28 +09:00
1 changed files with 1 additions and 0 deletions
--- a/llvm.spec
+++ b/llvm.spec
@ -487,6 +487,7 @@ exit 0
 %exclude %{_mandir}/man1/clang.1.*
 %endif
 %doc %{_mandir}/man1/*.1.*
+%exclude %{_mandir}/man1/llvm-config.1.*

 %files devel
 %defattr(-,root,root,-)