Merge pull request #17 from joeycastillo/wip-launcher

author joeycastillo <joeycastillo@utexas.edu>

Mon, 18 Oct 2021 19:37:41 +0000 (15:37 -0400)

committer GitHub <noreply@github.com>

Mon, 18 Oct 2021 19:37:41 +0000 (15:37 -0400)
author joeycastillo <joeycastillo@utexas.edu>
Mon, 18 Oct 2021 19:37:41 +0000 (15:37 -0400)
committer GitHub <noreply@github.com>
Mon, 18 Oct 2021 19:37:41 +0000 (15:37 -0400)
diff --cc watch-library/watch/watch_slcd.c
Simple merge
diff --cc watch-library/watch/watch_slcd.h
Simple merge
author	joeycastillo <joeycastillo@utexas.edu>
	Mon, 18 Oct 2021 19:37:41 +0000 (15:37 -0400)
committer	GitHub <noreply@github.com>
	Mon, 18 Oct 2021 19:37:41 +0000 (15:37 -0400)
		1	2
watch-library/watch/watch_slcd.c	patch \|	diff1 \|	diff2 \|	blob \| history
watch-library/watch/watch_slcd.h	patch \|	diff1 \|	diff2 \|	blob \| history