Merge branch 'wxr1215' into dev

wxr

2022-05-18 b1b3f47f3eeff8536b1a2851781da0b04f346fef

1
2
3
4
5
6
<?xml version="1.0" encoding="UTF-8"?> 
<project version="4"> 
  <component name="CompilerConfiguration"> 
    <bytecodeTargetLevel target="1.8" /> 
  </component> 
</project>