project: Update for 11.1.0 merge.

Author: Sibras

SMP/libharfbuzz.vcxproj.filters

@@ -885,9 +885,6 @@
     <ClInclude Include="..\src\hb-ot-var-cvar-table.hh">
       <Filter>Header Files\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\hb-subset-plan-member-list.hh.hh">
-      <Filter>Header Files\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\hb-subset-instace-solver.hh">
       <Filter>Header Files\src</Filter>
     </ClInclude>
@@ -918,6 +915,18 @@
     <ClInclude Include="..\src\hb-directwrite.hh">
       <Filter>Header Files\src</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\hb-subset-plan-var.hh">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hb-script-list.h">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hb-subset-plan-layout.hh">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hb-subset-plan-member-list.hh">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\hb-blob.cc">

SMP/libharfbuzz_files.props

@@ -158,6 +158,7 @@
     <ClInclude Include="..\src\hb-priority-queue.hh" />
     <ClInclude Include="..\src\hb-repacker.hh" />
     <ClInclude Include="..\src\hb-sanitize.hh" />
+    <ClInclude Include="..\src\hb-script-list.h" />
     <ClInclude Include="..\src\hb-serialize.hh" />
     <ClInclude Include="..\src\hb-set-digest.hh" />
     <ClInclude Include="..\src\hb-set.h" />
@@ -177,7 +178,9 @@
     <ClInclude Include="..\src\hb-subset-instancer-iup.hh" />
     <ClInclude Include="..\src\hb-subset-input.hh" />
     <ClInclude Include="..\src\hb-subset-plan.hh" />
-    <ClInclude Include="..\src\hb-subset-plan-member-list.hh.hh" />
+    <ClInclude Include="..\src\hb-subset-plan-layout.hh" />
+    <ClInclude Include="..\src\hb-subset-plan-member-list.hh" />
+    <ClInclude Include="..\src\hb-subset-plan-var.hh" />
     <ClInclude Include="..\src\hb-subset-serialize.h" />
     <ClInclude Include="..\src\hb-subset.h" />
     <ClInclude Include="..\src\hb-subset.hh" />

SMP/libharfbuzz_winrt.vcxproj.filters

@@ -885,9 +885,6 @@
     <ClInclude Include="..\src\hb-ot-var-cvar-table.hh">
       <Filter>Header Files\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\hb-subset-plan-member-list.hh.hh">
-      <Filter>Header Files\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\hb-subset-instace-solver.hh">
       <Filter>Header Files\src</Filter>
     </ClInclude>
@@ -918,6 +915,18 @@
     <ClInclude Include="..\src\hb-bit-vector.hh">
       <Filter>Header Files\src</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\hb-script-list.h">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hb-subset-plan-layout.hh">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hb-subset-plan-member-list.hh">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hb-subset-plan-var.hh">
+      <Filter>Header Files\src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\hb-blob.cc">