Previous 199869 Revisions Next

r33896 Monday 15th December, 2014 at 14:39:46 UTC by Miodrag Milanović
Merge branch 'master' of https://github.com/mamedev/mame
[src/osd/sdl]input.c
[src/osd/sdl/man]castool.1 chdman.1 floptool.1 imgtool.1 jedutil.1 ldresample.1 ldverify.1 mame.6 mess.6 romcmp.1 testkeys.1

trunk/src/osd/sdl/input.c
r242407r242408
757757
758758      osd_printf_verbose("Joystick: %s\n", devinfo->name.cstr());
759759      osd_printf_verbose("Joystick:   ...  %d axes, %d buttons %d hats %d balls\n", SDL_JoystickNumAxes(joy), SDL_JoystickNumButtons(joy), SDL_JoystickNumHats(joy), SDL_JoystickNumBalls(joy));
760      osd_printf_verbose("Joystick:   ...  Physical id %d mapped to logical id %d\n", physical_stick, stick);
760      osd_printf_verbose("Joystick:   ...  Physical id %d mapped to logical id %d\n", physical_stick, stick + 1);
761761
762762      // loop over all axes
763763      for (axis = 0; axis < SDL_JoystickNumAxes(joy); axis++)
trunk/src/osd/sdl/man/castool.1
r242407r242408
66.\" Cesare Falco <c.falco@ubuntu.com>, February 2011
77.\"
88.\"
9.TH CASTOOL 1 2014-11-19 0.156 "MESS Generic cassette manipulation tool"
9.TH CASTOOL 1 2014-12-15 0.157 "MESS Generic cassette manipulation tool"
1010.\"
1111.\"
1212.\" NAME chapter
trunk/src/osd/sdl/man/chdman.1
r242407r242408
66.\" Ashley T. Howes <debiandev@ashleyhowes.com>, February 2005
77.\" updated by Cesare Falco <c.falco@ubuntu.com>, February 2007
88.\"
9.TH CHDMAN 1 2014-11-19 0.156 "MAME Compressed Hunks of Data (CHD) manager"
9.TH CHDMAN 1 2014-12-15 0.157 "MAME Compressed Hunks of Data (CHD) manager"
1010.\"
1111.\" NAME chapter
1212.SH NAME
trunk/src/osd/sdl/man/floptool.1
r242407r242408
66.\" Cesare Falco <c.falco@ubuntu.com>, April 2014
77.\"
88.\"
9.TH FLOPTOOL 1 2014-11-19 0.156 "MESS Generic floppy manipulation tool"
9.TH FLOPTOOL 1 2014-12-15 0.157 "MESS Generic floppy manipulation tool"
1010.\"
1111.\"
1212.\" NAME chapter
trunk/src/osd/sdl/man/imgtool.1
r242407r242408
66.\" Cesare Falco <c.falco@ubuntu.com>, February 2011
77.\"
88.\"
9.TH IMGTOOL 1 2014-11-19 0.156 "MESS media image manipulation tool"
9.TH IMGTOOL 1 2014-12-15 0.157 "MESS media image manipulation tool"
1010.\"
1111.\"
1212.\" NAME chapter
trunk/src/osd/sdl/man/jedutil.1
r242407r242408
88.\" References
99.\" http://aarongiles.com/?p=159
1010.\"
11.TH JEDUTIL 1 2014-11-19 0.156 "MAME JEDEC file utilities"
11.TH JEDUTIL 1 2014-12-15 0.157 "MAME JEDEC file utilities"
1212.\"
1313.\" NAME chapter
1414.SH NAME
trunk/src/osd/sdl/man/ldresample.1
r242407r242408
33.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
44.\" other parameters are allowed: see man(7), man(1)
55.\"
6.TH LDRESAMPLE 1 2014-11-19 0.156 "MAME laserdisc audio manipulation tool"
6.TH LDRESAMPLE 1 2014-12-15 0.157 "MAME laserdisc audio manipulation tool"
77.\"
88.\" Please adjust this date whenever revising the manpage.
99.\"
trunk/src/osd/sdl/man/ldverify.1
r242407r242408
55.\" Man page created from source and usage information by
66.\" Cesare Falco <c.falco@ubuntu.com>, August 2008
77.\"
8.TH LDVERIFY 1 2014-11-19 0.156 "MAME laserdisc data checker"
8.TH LDVERIFY 1 2014-12-15 0.157 "MAME laserdisc data checker"
99.\"
1010.\" NAME chapter
1111.SH NAME
trunk/src/osd/sdl/man/mame.6
r242407r242408
1313.\" and updated by Andrew Burton <burtona@gol.com>, July 2003
1414.\"
1515.\"
16.TH MAME 6 2014-11-19 0.156 "MAME \- The Multiple Arcade Machine Emulator"
16.TH MAME 6 2014-12-15 0.157 "MAME \- The Multiple Arcade Machine Emulator"
1717.\"
1818.\"
1919.\" NAME chapter
trunk/src/osd/sdl/man/mess.6
r242407r242408
1616.\" http://www.mess.org/
1717.\"
1818.\"
19.TH MESS 6 2014-11-19 0.156 "The Multiple Emulator Super System (MESS)"
19.TH MESS 6 2014-12-15 0.157 "The Multiple Emulator Super System (MESS)"
2020.\"
2121.\"
2222.\" NAME chapter
trunk/src/osd/sdl/man/romcmp.1
r242407r242408
99.\" References
1010.\" http://www.mame.net/mamefaq.html
1111.\"
12.TH ROMCMP 1 2014-11-19 0.156 "MAME romset checking tool"
12.TH ROMCMP 1 2014-12-15 0.157 "MAME romset checking tool"
1313.\"
1414.\" NAME chapter
1515.SH NAME
trunk/src/osd/sdl/man/testkeys.1
r242407r242408
55.\" Man page created from source and usage information
66.\" Cesare Falco <c.falco@ubuntu.com>, February 2007
77.\"
8.TH TESTKEYS 1 2014-11-19 0.156 "MAME SDL keycode scanner"
8.TH TESTKEYS 1 2014-12-15 0.157 "MAME SDL keycode scanner"
99.\"
1010.\" NAME chapter
1111.SH NAME


Previous 199869 Revisions Next


© 1997-2024 The MAME Team