From: Wesley Aptekar-Cassels <me@wesleyac.com>
Date: Sun, 19 Nov 2023 05:56:33 +0000 (-0500)
Subject: Merge branch 'main' into feat/minute-repeater-decimal-face
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=6cc2b23723b0b2edfa14ba5ca0d4bc4b360a96f7;p=sensor-watch.git

Merge branch 'main' into feat/minute-repeater-decimal-face
---

6cc2b23723b0b2edfa14ba5ca0d4bc4b360a96f7
diff --cc movement/make/Makefile
index 64c0364,06e1725..376ee74
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -118,7 -118,7 +118,8 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/clock/minute_repeater_decimal_face.c \
+   ../watch_faces/complication/tuning_tones_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 8ece8b8,23c2613..96fc60a
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -95,7 -95,7 +95,8 @@@
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "minute_repeater_decimal_face.h"
+ #include "tuning_tones_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_