From 4f83b00f6f98cff94ccdec7bbcd664e576bd878e Mon Sep 17 00:00:00 2001
From: Liam
Date: Mon, 8 Jan 2024 09:34:16 -0500
Subject: general: fix trailing whitespace

---
 externals/ffmpeg/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'externals')

diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index f2886eb6c..543585d4f 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -138,7 +138,7 @@ if (NOT WIN32 AND NOT ANDROID)
             --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android-
             --sysroot=${SYSROOT}
             --target-os=android
-            --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld" 
+            --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
             --extra-ldflags="-nostdlib"
         )
     endif()
-- 
cgit v1.2.3


From d99830b59c83bd029f16a93e73b872979fed2e6f Mon Sep 17 00:00:00 2001
From: lat9nq
Date: Tue, 9 Jan 2024 17:29:38 -0500
Subject: externals: Update txdb_to_nx

Includes a fix lat9nq/tzdb_to_nx@1e82342 that fixes a build issue on Mac OS.
---
 externals/nx_tzdb/tzdb_to_nx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'externals')

diff --git a/externals/nx_tzdb/tzdb_to_nx b/externals/nx_tzdb/tzdb_to_nx
index f6680093b..404d39004 160000
--- a/externals/nx_tzdb/tzdb_to_nx
+++ b/externals/nx_tzdb/tzdb_to_nx
@@ -1 +1 @@
-Subproject commit f6680093bca30265c161581fd813d4ddd33f1e3e
+Subproject commit 404d39004570a26c734a9d1fa29ab4d63089c599
-- 
cgit v1.2.3