CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into profiles

Browse Source
This commit is contained in:
Valentin Vanelslande
2019-01-07 10:39:44 -05:00
committed by GitHub
parent df02ea48d2 941d241e7d
commit 62b40e9155
18 changed files with 132 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/citra_qt/configuration/configure_input.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>374</width>
<height>535</height>
<height>595</height>
</rect>
</property>
<property name="windowTitle">
@@ -597,6 +597,42 @@
</item>
</layout>
</item>
<item row="2" column="1">
<layout class="QVBoxLayout" name="verticalLayout_33">
<item>
<widget class="QLabel" name="label_41">
<property name="text">
<string>GPIO14:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonGpio14">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout_32">
<item>
<widget class="QLabel" name="label_40">
<property name="text">
<string>Debug:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonDebug">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>