1
0
Fork 0

Merge commit 'refs/merge-requests/17' of git://gitorious.org/fg/fgdata into gral/joystick

This commit is contained in:
Frederic Bouvier 2010-08-13 22:18:08 +02:00
commit 9759006b05

View file

@ -30,6 +30,7 @@ $Id$
<name>Logitech Extreme 3D Pro</name> <name>Logitech Extreme 3D Pro</name>
<name>Logitech Extreme 3D Pro USB</name> <name>Logitech Extreme 3D Pro USB</name>
<name>Logitech Extreme 3D Pro USB</name> <name>Logitech Extreme 3D Pro USB</name>
<name>Logitech Extreme 3D</name>
<axis n="0"> <axis n="0">
<desc>Aileron</desc> <desc>Aileron</desc>
@ -55,6 +56,7 @@ $Id$
<number> <number>
<unix>2</unix> <unix>2</unix>
<windows>3</windows> <windows>3</windows>
<mac>2</mac>
</number> </number>
<binding> <binding>
<command>property-scale</command> <command>property-scale</command>
@ -68,6 +70,7 @@ $Id$
<number> <number>
<unix>3</unix> <unix>3</unix>
<windows>2</windows> <windows>2</windows>
<mac>3</mac>
</number> </number>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -80,6 +83,7 @@ $Id$
<number> <number>
<unix>4</unix> <unix>4</unix>
<windows>6</windows> <windows>6</windows>
<mac>4</mac>
</number> </number>
<low> <low>
<repeatable>true</repeatable> <repeatable>true</repeatable>
@ -104,6 +108,7 @@ $Id$
<number> <number>
<unix>5</unix> <unix>5</unix>
<windows>7</windows> <windows>7</windows>
<mac>5</mac>
</number> </number>
<low> <low>
<repeatable>true</repeatable> <repeatable>true</repeatable>