Merge branch 'master' into develop

This commit is contained in:
Steve Franke 2018-06-29 10:19:28 -05:00
commit e05c8b8144

View File

@ -346,7 +346,7 @@
<string>Start </string> <string>Start </string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>5000</number> <number>4900</number>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<number>100</number> <number>100</number>