1
0
Fork 0

Merge branch 'master' of git://gitorious.org/fg/fgdata

This commit is contained in:
syd 2012-09-03 16:39:42 -06:00
commit 9955e9a1b2
2 changed files with 3 additions and 3 deletions

View file

@ -56,7 +56,7 @@ var assignButton = func(cmd) {
<text>
<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>
<hrule/>

View file

@ -737,10 +737,10 @@
</item>
<item>
<name>joystick-info</name>
<name>joystick-config</name>
<binding>
<command>dialog-show</command>
<dialog-name>joystick-info</dialog-name>
<dialog-name>joystick-config</dialog-name>
</binding>
</item>