From: Wesley Aptekar-Cassels <me@wesleyac.com>
Date: Sun, 21 Jan 2024 07:01:27 +0000 (-0500)
Subject: Merge branch 'main' into watch-face-simple-coin-flip
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=f16ce6a7670c8e26d46623fdbf928d4d8aa2c1fb;p=sensor-watch.git

Merge branch 'main' into watch-face-simple-coin-flip
---

f16ce6a7670c8e26d46623fdbf928d4d8aa2c1fb
diff --cc movement/make/Makefile
index 35f610a,df11a9a..82bae62
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -118,7 -118,11 +118,12 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/complication/simple_coin_flip_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 0d7227a,a3ccc13..d232f0a
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -95,7 -95,11 +95,12 @@@
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "simple_coin_flip_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_