Merge branch 'master' of git://gitorious.org/fg/fgdata
This commit is contained in:
commit
9955e9a1b2
2 changed files with 3 additions and 3 deletions
|
@ -56,7 +56,7 @@ var assignButton = func(cmd) {
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
<halign>left</halign>
|
<halign>left</halign>
|
||||||
<label>Select the command you wish to assign to this button</label>
|
<label>Select the command you wish to assign to this button.</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule/>
|
<hrule/>
|
||||||
|
|
|
@ -737,10 +737,10 @@
|
||||||
</item>
|
</item>
|
||||||
|
|
||||||
<item>
|
<item>
|
||||||
<name>joystick-info</name>
|
<name>joystick-config</name>
|
||||||
<binding>
|
<binding>
|
||||||
<command>dialog-show</command>
|
<command>dialog-show</command>
|
||||||
<dialog-name>joystick-info</dialog-name>
|
<dialog-name>joystick-config</dialog-name>
|
||||||
</binding>
|
</binding>
|
||||||
</item>
|
</item>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue