From: Wesley Aptekar-Cassels <me@wesleyac.com>
Date: Sun, 21 Jan 2024 06:58:20 +0000 (-0500)
Subject: Merge branch 'main' into watch-face-solstice
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=29784983b5018e429a276fd1cdfeeac8b0e431b9;p=sensor-watch.git

Merge branch 'main' into watch-face-solstice
---

29784983b5018e429a276fd1cdfeeac8b0e431b9
diff --cc movement/make/Makefile
index d020fc9,512f2ea..df11a9a
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -118,7 -118,10 +118,11 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/complication/solstice_face.c \
+   ../watch_faces/complication/couch_to_5k_face.c \
+   ../watch_faces/clock/minute_repeater_decimal_face.c \
+   ../watch_faces/complication/tuning_tones_face.c \
+   ../watch_faces/complication/kitchen_conversions_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 2131e58,be3a015..a3ccc13
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -95,7 -95,10 +95,11 @@@
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "solstice_face.h"
+ #include "couch_to_5k_face.h"
+ #include "minute_repeater_decimal_face.h"
+ #include "tuning_tones_face.h"
+ #include "kitchen_conversions_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_