Merge branch 'wjc_new' into lwj_new

mac

2024-05-15 3e3904224ff6b37c654f54cee56e9ca466f289de

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?> 
<resources> 
 
  <integer name="animation_default_duration">300</integer> 
</resources>