Merge branch 'main' of github.com:joeycastillo/Sensor-Watch into lfs

author Joey Castillo <joeycastillo@utexas.edu>

Tue, 2 Aug 2022 14:17:26 +0000 (08:17 -0600)

committer Joey Castillo <joeycastillo@utexas.edu>

Tue, 2 Aug 2022 14:17:26 +0000 (08:17 -0600)
author Joey Castillo <joeycastillo@utexas.edu>
Tue, 2 Aug 2022 14:17:26 +0000 (08:17 -0600)
committer Joey Castillo <joeycastillo@utexas.edu>
Tue, 2 Aug 2022 14:17:26 +0000 (08:17 -0600)
diff --cc make.mk
Simple merge
diff --cc movement/make/Makefile
Simple merge
diff --cc movement/movement.c
Simple merge
diff --cc watch-library/hardware/watch/watch_private.c
Simple merge
author	Joey Castillo <joeycastillo@utexas.edu>
	Tue, 2 Aug 2022 14:17:26 +0000 (08:17 -0600)
committer	Joey Castillo <joeycastillo@utexas.edu>
	Tue, 2 Aug 2022 14:17:26 +0000 (08:17 -0600)
		1	2
make.mk	patch \|	diff1 \|	diff2 \|	blob \| history
movement/make/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
movement/movement.c	patch \|	diff1 \|	diff2 \|	blob \| history
watch-library/hardware/watch/watch_private.c	patch \|	diff1 \|	diff2 \|	blob \| history