Merged changes

author Michael D. Lowis <mike@mdlowis.com>

Mon, 30 Nov 2015 00:56:09 +0000 (19:56 -0500)

committer Michael D. Lowis <mike@mdlowis.com>

Mon, 30 Nov 2015 00:56:09 +0000 (19:56 -0500)
author Michael D. Lowis <mike@mdlowis.com>
Mon, 30 Nov 2015 00:56:09 +0000 (19:56 -0500)
committer Michael D. Lowis <mike@mdlowis.com>
Mon, 30 Nov 2015 00:56:09 +0000 (19:56 -0500)
diff --cc source/onward.c

index c5095a550eccd011228d62bce999f4255225f70c,a4ae923cb14d1706ef577e063793f2eb1c39f6c2..48e07eb12c6d72e786fb765cda151b25199e9bd3

mode 100644,100755..100644
--- 1/source/onward.c
--- 2/source/onward.c
+++ b/source/onward.c
diff --cc source/onward.h

index 3f240ecb2b706f9302ce13bf403a018db5fbe51f,be6f6454aa8607c0d40bd87708239e4d7c8f9ac5..d96eeedab06ffaa561f561084ef7e90c51c8f8fb

mode 100644,100755..100644
--- 1/source/onward.h
--- 2/source/onward.h
+++ b/source/onward.h
author	Michael D. Lowis <mike@mdlowis.com>
	Mon, 30 Nov 2015 00:56:09 +0000 (19:56 -0500)
committer	Michael D. Lowis <mike@mdlowis.com>
	Mon, 30 Nov 2015 00:56:09 +0000 (19:56 -0500)
		1	2
source/onward.c	patch \|	diff1 \|	diff2 \|	blob \| history
source/onward.h	patch \|	diff1 \|	diff2 \|	blob \| history