From: voloved <36523934+voloved@users.noreply.github.com>
Date: Thu, 20 Nov 2025 23:22:27 +0000 (-0500)
Subject: Merge branch 'main' into endless_runner_port
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=e5dfd4c93a71037e65c53bef3d21a15887a1459b;p=sensor-watch.git

Merge branch 'main' into endless_runner_port
---

e5dfd4c93a71037e65c53bef3d21a15887a1459b
diff --cc movement_faces.h
index bcd8233,fab9ee3..84d08f2
--- a/movement_faces.h
+++ b/movement_faces.h
@@@ -73,5 -73,5 +73,6 @@@
  #include "wareki_face.h"
  #include "deadline_face.h"
  #include "wordle_face.h"
+ #include "blackjack_face.h"
 +#include "endless_runner_face.h"
  // New includes go above this line.
diff --cc watch-faces.mk
index 95d8187,52919f5..c0d9a49
--- a/watch-faces.mk
+++ b/watch-faces.mk
@@@ -48,5 -48,5 +48,6 @@@ SRCS += 
    ./watch-faces/sensor/lis2dw_monitor_face.c \
    ./watch-faces/complication/wareki_face.c \
    ./watch-faces/complication/deadline_face.c \
+   ./watch-faces/complication/blackjack_face.c \
 +  ./watch-faces/complication/endless_runner_face.c \
  # New watch faces go above this line.