Commit 1321db3e by Kim Jinsung

Merge branch 'features/1.2.363_41304' into 'features/1.2.363'

Bug #41304 会議室にて司会者がマーキングの色変更を行うとアプリが異常終了する

See merge request !118
parents 61a5de98 d669c7c7
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- ソースで文字列連結してアクセスしているためlintに引っかかってしまうので注意 -->
<integer name="marking_size_0">5</integer>
<integer name="marking_size_1">10</integer>
<integer name="marking_size_2">25</integer>
<integer name="marking_size_3">50</integer>
<integer name="marking_size_4">100</integer>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment