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

Conflicts: yiiguxing.translation.xml
3 years ago · 5491c0ed72
parent 2bc5cf752c d245ff1c84
commit 5491c0ed72
2 changed files with 22 additions and 24 deletions
--- a/deviceManagerPhysicalTab.xml
+++ b/deviceManagerPhysicalTab.xml
@ -5,6 +5,17 @@
        <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>
            <type value="SERIAL_NUMBER" />
            <value value="22cbc849" />
          </Key>
        </key>
@ -27,17 +38,6 @@
        <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>
            <type value="SERIAL_NUMBER" />
            <value value="192.168.123.137:39303" />
          </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>
--- a/editor-font.xml
+++ b/editor-font.xml
@ -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>