[MERGE] (master|vendor_Seitosh): vendor import of 23.10.2015
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
Showing
This diff is collapsed.
contrib/aff/doxygen.txt
0 → 100644
This diff is collapsed.