From: Michael D. Lowis <mike@mdlowis.com>
Date: Sun, 29 Nov 2015 23:31:45 +0000 (-0500)
Subject: merge changes
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=bb6b7ed3b2d65af99f9e92ad0dd29755ad4cb343;p=projs%2Fopts.git

merge changes
---

bb6b7ed3b2d65af99f9e92ad0dd29755ad4cb343
diff --cc source/opts.c
index db00d7a,d061049..d061049
mode 100644,100755..100644
--- a/source/opts.c
+++ b/source/opts.c
diff --cc source/opts.h
index 461eb0c,a6c4166..a6c4166
mode 100644,100755..100644
--- a/source/opts.h
+++ b/source/opts.h
diff --cc tests/test_opts.c
index 3be93f6,97adcbe..97adcbe
mode 100644,100755..100644
--- a/tests/test_opts.c
+++ b/tests/test_opts.c