Merge branch 'wez:main' into fix_wayland_hidpi_crash

wez · Jan 10, 2025 · 805eded · 805eded
2 parents 773b749 + 8e9cf91
commit 805eded
Show file tree

Hide file tree

Showing 6 changed files with 224 additions and 208 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -9,4 +9,4 @@
 	url = https://github.com/madler/zlib.git
 [submodule "freetype2"]
 	path = deps/freetype/freetype2
-	url = https://github.com/wez/freetype2.git
+	url = https://github.com/freetype/freetype2.git
diff --git a/deps/freetype/freetype2 b/deps/freetype/freetype2
diff --git a/deps/freetype/libpng b/deps/freetype/libpng
diff --git a/deps/freetype/zlib b/deps/freetype/zlib
diff --git a/nix/flake.lock b/nix/flake.lock