Merge branch 'main' into feat/mad-manifesto-vm-fetching

Alystrasz · Jul 28, 2024 · 1e6a0b1 · 1e6a0b1
2 parents 34bd5e0 + 7abae6c
commit 1e6a0b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 40 deletions.
diff --git a/Northstar.Client/keyvalues/resource/fontfiletable.txt b/Northstar.Client/keyvalues/resource/fontfiletable.txt
@@ -0,0 +1,10 @@
+FontFileTable
+{
+	"arial unicode ms"			"resource/Lato-Regular.ttf"
+
+	"lucida console"			"resource/NorthstarMono.ttf"			[$PC]
+
+	"arial"						"resource/Lato-Regular.ttf"
+	"arial bold"				"resource/Lato-Regular.ttf"
+	"arial narrow"				"resource/Lato-Regular.ttf"
+}
diff --git a/Northstar.Client/mod/resource/fontfiletable.txt b/Northstar.Client/mod/resource/fontfiletable.txt