Commit 4f51bc3e authored by Vincent Pinon's avatar Vincent Pinon

Merge branch 'release/20.08'

parents 7df43a54 a1555032
Pipeline #36954 passed with stage
in 13 minutes and 20 seconds
......@@ -58,7 +58,7 @@
</widget>
</item>
<item>
<widget class="KUrlRequester" name="out_file" native="true"/>
<widget class="KUrlRequester" name="out_file"/>
</item>
</layout>
</item>
......@@ -341,13 +341,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="parallel_process">
<property name="text">
<string>Parallel processing</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
......@@ -488,7 +481,7 @@
<item>
<widget class="QLabel" name="threadsLabel">
<property name="text">
<string>Threads</string>
<string>Encoder threads</string>
</property>
</widget>
</item>
......@@ -523,6 +516,13 @@
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="parallel_process">
<property name="text">
<string>Parallel processing (experimental!)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkTwoPass">
<property name="text">
......
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