Merge branch 'master' into conflictingFontFix

7aa3631d · Dominik Röttsches · GitHub · f7da0486 · abae93fa · 7aa3631d
展开全部隐藏空白更改
内联并排

Showing with 252 addition and 318 deletion

src/hb-directwrite.cc src/hb-directwrite.cc +251 -317

src/hb-directwrite.h src/hb-directwrite.h +1 -1

未找到文件。
--- a/src/hb-directwrite.cc
+++ b/src/hb-directwrite.cc
--- a/src/hb-directwrite.h
+++ b/src/hb-directwrite.h
@@ -31,4 +31,4 @@ HB_BEGIN_DECLS

 HB_END_DECLS

-#endif /* HB_UNISCRIBE_H */
+#endif /* HB_DIRECTWRITE_H */