AI-222.4459.24.2221.9409768 <debuggerx@debuggerx-e5 Merge branch 'master'

Conflicts:
	yiiguxing.translation.xml
This commit is contained in:
2023-01-03 19:08:15 +08:00
2 changed files with 22 additions and 24 deletions
+22 -11
View File
@@ -1,6 +1,17 @@
<application>
<component name="deviceManagerPhysicalTab">
<physicalDevices>
<PhysicalDevice>
<key>
<Key>
<type value="SERIAL_NUMBER" />
<value value="c1492081" />
</Key>
</key>
<name value="Xiaomi M2011K2C" />
<target value="Android 12.0" />
<api value="androidversion:31:null:null:true" />
</PhysicalDevice>
<PhysicalDevice>
<key>
<Key>
@@ -23,17 +34,6 @@
<target value="Android 7.0" />
<api value="androidversion:24:null:null:true" />
</PhysicalDevice>
<PhysicalDevice>
<key>
<Key>
<type value="SERIAL_NUMBER" />
<value value="c1492081" />
</Key>
</key>
<name value="Xiaomi M2011K2C" />
<target value="Android 12.0" />
<api value="androidversion:31:null:null:true" />
</PhysicalDevice>
<PhysicalDevice>
<key>
<Key>
@@ -100,6 +100,17 @@
<target value="Android 12.0" />
<api value="androidversion:31:null:null:true" />
</PhysicalDevice>
<PhysicalDevice>
<key>
<Key>
<type value="SERIAL_NUMBER" />
<value value="192.168.123.137:5667" />
</Key>
</key>
<name value="LGE Nexus 5" />
<target value="Android 9.0" />
<api value="androidversion:28:null:null:true" />
</PhysicalDevice>
</physicalDevices>
</component>
</application>
-13
View File
@@ -1,13 +0,0 @@
<application>
<component name="DefaultFont">
<option name="VERSION" value="1" />
<option name="FONT_SIZE" value="20" />
<option name="FONT_SIZE_2D" value="20.0" />
<option name="FONT_FAMILY" value="Fira Code" />
<option name="FONT_REGULAR_SUB_FAMILY" value="SemiBold" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
<option name="FONT_SCALE" value="1.5" />
<option name="USE_LIGATURES" value="true" />
<option name="SECONDARY_FONT_FAMILY" value="Noto Sans Mono CJK SC" />
</component>
</application>