From: joeycastillo <joeycastillo@utexas.edu>
Date: Sat, 11 Mar 2023 21:06:38 +0000 (-0500)
Subject: Merge branch 'main' into repetition_minute
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=266831cef0eaebc266383a0fea386efc86530461;p=sensor-watch.git

Merge branch 'main' into repetition_minute
---

266831cef0eaebc266383a0fea386efc86530461
diff --cc movement/make/Makefile
index a9530dd,6865960..aa22262
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -96,7 -96,7 +96,8 @@@ SRCS += 
    ../watch_faces/complication/morsecalc_face.c \
    ../watch_faces/complication/rpn_calculator_face.c \
    ../watch_faces/complication/ships_bell_face.c \
+   ../watch_faces/complication/habit_face.c \
 +  ../watch_faces/clock/repetition_minute_face.c \
  # New watch faces go above this line.
  
  # Leave this line at the bottom of the file; it has all the targets for making your project.
diff --cc movement/movement_faces.h
index 22eff42,901260e..cd58cee
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -74,7 -74,7 +74,8 @@@
  #include "morsecalc_face.h"
  #include "rpn_calculator_face.h"
  #include "ships_bell_face.h"
+ #include "habit_face.h"
 +#include "repetition_minute_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_