[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

[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
6d6a575a · thomas.forbriger · 02cfa44c · 25190a67 · 6d6a575a · 6d6a575a
Commit 6d6a575a authored Oct 23, 2015 by thomas.forbriger
--- a/contrib/stfinv/stfinvfixedstf.h
+++ b/contrib/stfinv/stfinvfixedstf.h
--- a/contrib/stfinv/stfinvfourier.cc
+++ b/contrib/stfinv/stfinvfourier.cc
--- a/contrib/stfinv/stfinvfourier.h
+++ b/contrib/stfinv/stfinvfourier.h
--- a/contrib/stfinv/stfinvidentity.cc
+++ b/contrib/stfinv/stfinvidentity.cc
--- a/contrib/stfinv/stfinvidentity.h
+++ b/contrib/stfinv/stfinvidentity.h
--- a/contrib/stfinv/stfinvnormalize.cc
+++ b/contrib/stfinv/stfinvnormalize.cc
--- a/contrib/stfinv/stfinvnormalize.h
+++ b/contrib/stfinv/stfinvnormalize.h
--- a/contrib/stfinv/test_libstfinv/README
+++ b/contrib/stfinv/test_libstfinv/README
--- a/contrib/stfinv/test_libstfinv_withpairs/src/Makefile
+++ b/contrib/stfinv/test_libstfinv_withpairs/src/Makefile
--- a/contrib/stfinv/test_libstfinv_withpairs/src/Test_libstfinv.c
+++ b/contrib/stfinv/test_libstfinv_withpairs/src/Test_libstfinv.c
--- a/contrib/stfinv/test_libstfinv_withpairs/src/fd.h
+++ b/contrib/stfinv/test_libstfinv_withpairs/src/fd.h
--- a/contrib/stfinv/test_libstfinv_withpairs/src/globvar.h
+++ b/contrib/stfinv/test_libstfinv_withpairs/src/globvar.h
--- a/contrib/stfinv/test_libstfinv_withpairs/src/read_parameters.c
+++ b/contrib/stfinv/test_libstfinv_withpairs/src/read_parameters.c
--- a/contrib/stfinv/test_libstfinv_withpairs/src/segy.h
+++ b/contrib/stfinv/test_libstfinv_withpairs/src/segy.h
--- a/contrib/stfinv/tests/onlinehelp.cc
+++ b/contrib/stfinv/tests/onlinehelp.cc
--- a/contrib/stfinv/tests/tooltest.cc
+++ b/contrib/stfinv/tests/tooltest.cc
--- a/contrib/stfinv/tools.cc
+++ b/contrib/stfinv/tools.cc
--- a/contrib/stfinv/tools.h
+++ b/contrib/stfinv/tools.h
--- a/contrib/stfinv/usage/stfinv_description_usage.txt
+++ b/contrib/stfinv/usage/stfinv_description_usage.txt
--- a/contrib/stfinv/usage/stfinv_summary_usage.txt
+++ b/contrib/stfinv/usage/stfinv_summary_usage.txt