Merge branch 'release/9.1' into LT-22011

sillsdev · Dec 13, 2024 · 5d20cbf · 5d20cbf
2 parents ff11ff8 + 58b286c
commit 5d20cbf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Src/LexText/LexTextControls/LinkMSADlg.resx b/Src/LexText/LexTextControls/LinkMSADlg.resx
@@ -195,7 +195,7 @@
 	<value>102, 32</value>
   </data>
   <data name="m_panel1.Size" type="System.Drawing.Size, System.Drawing">
-	<value>208, 20</value>
+	<value>300, 20</value>
   </data>
   <data name="&gt;&gt;m_panel1.Name" xml:space="preserve">
 	<value>m_panel1</value>

diff --git a/Src/UnicodeCharEditor/App.config b/Src/UnicodeCharEditor/App.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="icu.net" publicKeyToken="416fdd914afa6b66" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>