-
we7765 authored
Merge branch 'vendor_Seitosh' Conflicts: contrib/aff/README.export contrib/fourier/README.export contrib/stfinv/README.export Commands executed on branch master (as a guideline for future imports): git merge -X theirs vendor_Seitosh git rm contrib/*/README.export git commit
6d6a575a