• thomas.forbriger's avatar
    [MERGE] (master|vendor_Seitosh): vendor import of 23.10.2015 · 6d6a575a
    thomas.forbriger 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
Makefile 9.83 KB