Merge branch 'master' into next

This commit is contained in:
Bastian Bloessl
2018-06-21 10:05:20 +01:00
8 changed files with 26 additions and 26 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
<name>Period (ms)</name>
<key>interval</key>
<value>1000</value>
<type>real</type>
<type>int</type>
</param>
<param>
<name>Quit</name>
+1 -1
View File
@@ -17,7 +17,7 @@
<name>Period (ms)</name>
<key>interval</key>
<value>1000</value>
<type>real</type>
<type>int</type>
</param>
<param>
<name>Quit</name>