changeset 130:9d522c13ec68

Merge accidental heads
author IBBoard <dev@ibboard.co.uk>
date Tue, 29 Oct 2019 16:49:15 +0000
parents 0354415a8e48 (diff) 724d0e149569 (current diff)
children 5f6e4aa53501
files
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/10-noto-emoji.conf	Mon Sep 09 11:19:12 2019 +0100
+++ b/10-noto-emoji.conf	Tue Oct 29 16:49:15 2019 +0000
@@ -30,4 +30,10 @@
       <string>Noto Color Emoji</string>
     </edit>
   </match>
+  <!-- Fix the times when people put "Segoe UI; Segoe UI Emoji" and so we get emoji numbers -->
+  <alias binding="strong">
+    <family>Segoe UI</family>
+    <prefer><family>Noto Sans</family></prefer>
+    <default><family>sans-serif</family></default>
+  </alias>
 </fontconfig>
\ No newline at end of file
--- a/gitignore	Mon Sep 09 11:19:12 2019 +0100
+++ b/gitignore	Tue Oct 29 16:49:15 2019 +0000
@@ -1,1 +1,2 @@
-build/
\ No newline at end of file
+build/
+.vscode/
\ No newline at end of file