merge changes

diff --cc source/opts.c
index db00d7a40dcf8663b3e1d6b13c94903a09d29861,d061049fda527011731843934493a14c1aa93f3e..d061049fda527011731843934493a14c1aa93f3e
mode 100644,100755..100644
--- 1/source/opts.c
--- 2/source/opts.c
+++ b/source/opts.c

diff --cc source/opts.h
index 461eb0c6d766f69ee0d4a7be2bd41b356ecb8aa5,a6c41661f529012ede19df7397479000ba48da5c..a6c41661f529012ede19df7397479000ba48da5c
mode 100644,100755..100644
--- 1/source/opts.h
--- 2/source/opts.h
+++ b/source/opts.h

diff --cc tests/test_opts.c
index 3be93f67d478bfcb6bafd8a5a15580ae1c8e914b,97adcbe172eb5bd6f7908b2951da5c9653336089..97adcbe172eb5bd6f7908b2951da5c9653336089
mode 100644,100755..100644
--- 1/tests/test_opts.c
--- 2/tests/test_opts.c
+++ b/tests/test_opts.c