summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-12-15 15:39:46 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2014-12-15 15:39:46 +0100
commitef1f42397a0c7abc00900c2d3e2aa1915adeaae8 (patch)
tree29e3f353385601b9534a8160103b5685f86ed508
parent09a636c2ffdc4086b1316e4efb8d8c9c05d2b291 (diff)
parent8c2024272d02653a434c86067b28a9b61f247e13 (diff)
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r--src/osd/sdl/input.c2
-rw-r--r--src/osd/sdl/man/castool.12
-rw-r--r--src/osd/sdl/man/chdman.12
-rw-r--r--src/osd/sdl/man/floptool.12
-rw-r--r--src/osd/sdl/man/imgtool.12
-rw-r--r--src/osd/sdl/man/jedutil.12
-rw-r--r--src/osd/sdl/man/ldresample.12
-rw-r--r--src/osd/sdl/man/ldverify.12
-rw-r--r--src/osd/sdl/man/mame.62
-rw-r--r--src/osd/sdl/man/mess.62
-rw-r--r--src/osd/sdl/man/romcmp.12
-rw-r--r--src/osd/sdl/man/testkeys.12
12 files changed, 12 insertions, 12 deletions
diff --git a/src/osd/sdl/input.c b/src/osd/sdl/input.c
index d85a2bc41d0..f212e907c10 100644
--- a/src/osd/sdl/input.c
+++ b/src/osd/sdl/input.c
@@ -757,7 +757,7 @@ static void sdlinput_register_joysticks(running_machine &machine)
osd_printf_verbose("Joystick: %s\n", devinfo->name.cstr());
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));
- osd_printf_verbose("Joystick: ... Physical id %d mapped to logical id %d\n", physical_stick, stick);
+ osd_printf_verbose("Joystick: ... Physical id %d mapped to logical id %d\n", physical_stick, stick + 1);
// loop over all axes
for (axis = 0; axis < SDL_JoystickNumAxes(joy); axis++)
diff --git a/src/osd/sdl/man/castool.1 b/src/osd/sdl/man/castool.1
index 23bbc9af176..b5b62b9d4f7 100644
--- a/src/osd/sdl/man/castool.1
+++ b/src/osd/sdl/man/castool.1
@@ -6,7 +6,7 @@
.\" Cesare Falco <c.falco@ubuntu.com>, February 2011
.\"
.\"
-.TH CASTOOL 1 2014-11-19 0.156 "MESS Generic cassette manipulation tool"
+.TH CASTOOL 1 2014-12-15 0.157 "MESS Generic cassette manipulation tool"
.\"
.\"
.\" NAME chapter
diff --git a/src/osd/sdl/man/chdman.1 b/src/osd/sdl/man/chdman.1
index a8903ee9bad..5d96935d5b7 100644
--- a/src/osd/sdl/man/chdman.1
+++ b/src/osd/sdl/man/chdman.1
@@ -6,7 +6,7 @@
.\" Ashley T. Howes <debiandev@ashleyhowes.com>, February 2005
.\" updated by Cesare Falco <c.falco@ubuntu.com>, February 2007
.\"
-.TH CHDMAN 1 2014-11-19 0.156 "MAME Compressed Hunks of Data (CHD) manager"
+.TH CHDMAN 1 2014-12-15 0.157 "MAME Compressed Hunks of Data (CHD) manager"
.\"
.\" NAME chapter
.SH NAME
diff --git a/src/osd/sdl/man/floptool.1 b/src/osd/sdl/man/floptool.1
index 2d6f416ca42..8ee43f8fd04 100644
--- a/src/osd/sdl/man/floptool.1
+++ b/src/osd/sdl/man/floptool.1
@@ -6,7 +6,7 @@
.\" Cesare Falco <c.falco@ubuntu.com>, April 2014
.\"
.\"
-.TH FLOPTOOL 1 2014-11-19 0.156 "MESS Generic floppy manipulation tool"
+.TH FLOPTOOL 1 2014-12-15 0.157 "MESS Generic floppy manipulation tool"
.\"
.\"
.\" NAME chapter
diff --git a/src/osd/sdl/man/imgtool.1 b/src/osd/sdl/man/imgtool.1
index e50b9efe270..ee25b65bf7a 100644
--- a/src/osd/sdl/man/imgtool.1
+++ b/src/osd/sdl/man/imgtool.1
@@ -6,7 +6,7 @@
.\" Cesare Falco <c.falco@ubuntu.com>, February 2011
.\"
.\"
-.TH IMGTOOL 1 2014-11-19 0.156 "MESS media image manipulation tool"
+.TH IMGTOOL 1 2014-12-15 0.157 "MESS media image manipulation tool"
.\"
.\"
.\" NAME chapter
diff --git a/src/osd/sdl/man/jedutil.1 b/src/osd/sdl/man/jedutil.1
index e93bb3fe9f6..f8fe25b6f04 100644
--- a/src/osd/sdl/man/jedutil.1
+++ b/src/osd/sdl/man/jedutil.1
@@ -8,7 +8,7 @@
.\" References
.\" http://aarongiles.com/?p=159
.\"
-.TH JEDUTIL 1 2014-11-19 0.156 "MAME JEDEC file utilities"
+.TH JEDUTIL 1 2014-12-15 0.157 "MAME JEDEC file utilities"
.\"
.\" NAME chapter
.SH NAME
diff --git a/src/osd/sdl/man/ldresample.1 b/src/osd/sdl/man/ldresample.1
index 6a3544e351d..d402cc1d3c1 100644
--- a/src/osd/sdl/man/ldresample.1
+++ b/src/osd/sdl/man/ldresample.1
@@ -3,7 +3,7 @@
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.\"
-.TH LDRESAMPLE 1 2014-11-19 0.156 "MAME laserdisc audio manipulation tool"
+.TH LDRESAMPLE 1 2014-12-15 0.157 "MAME laserdisc audio manipulation tool"
.\"
.\" Please adjust this date whenever revising the manpage.
.\"
diff --git a/src/osd/sdl/man/ldverify.1 b/src/osd/sdl/man/ldverify.1
index d7b10b13d2d..bd0eb3b9141 100644
--- a/src/osd/sdl/man/ldverify.1
+++ b/src/osd/sdl/man/ldverify.1
@@ -5,7 +5,7 @@
.\" Man page created from source and usage information by
.\" Cesare Falco <c.falco@ubuntu.com>, August 2008
.\"
-.TH LDVERIFY 1 2014-11-19 0.156 "MAME laserdisc data checker"
+.TH LDVERIFY 1 2014-12-15 0.157 "MAME laserdisc data checker"
.\"
.\" NAME chapter
.SH NAME
diff --git a/src/osd/sdl/man/mame.6 b/src/osd/sdl/man/mame.6
index 1a4f1723bba..ce31ef0c208 100644
--- a/src/osd/sdl/man/mame.6
+++ b/src/osd/sdl/man/mame.6
@@ -13,7 +13,7 @@
.\" and updated by Andrew Burton <burtona@gol.com>, July 2003
.\"
.\"
-.TH MAME 6 2014-11-19 0.156 "MAME \- The Multiple Arcade Machine Emulator"
+.TH MAME 6 2014-12-15 0.157 "MAME \- The Multiple Arcade Machine Emulator"
.\"
.\"
.\" NAME chapter
diff --git a/src/osd/sdl/man/mess.6 b/src/osd/sdl/man/mess.6
index a3ddc12c3bc..54cd095d4d7 100644
--- a/src/osd/sdl/man/mess.6
+++ b/src/osd/sdl/man/mess.6
@@ -16,7 +16,7 @@
.\" http://www.mess.org/
.\"
.\"
-.TH MESS 6 2014-11-19 0.156 "The Multiple Emulator Super System (MESS)"
+.TH MESS 6 2014-12-15 0.157 "The Multiple Emulator Super System (MESS)"
.\"
.\"
.\" NAME chapter
diff --git a/src/osd/sdl/man/romcmp.1 b/src/osd/sdl/man/romcmp.1
index 094fe6f9e2e..68fac56b19b 100644
--- a/src/osd/sdl/man/romcmp.1
+++ b/src/osd/sdl/man/romcmp.1
@@ -9,7 +9,7 @@
.\" References
.\" http://www.mame.net/mamefaq.html
.\"
-.TH ROMCMP 1 2014-11-19 0.156 "MAME romset checking tool"
+.TH ROMCMP 1 2014-12-15 0.157 "MAME romset checking tool"
.\"
.\" NAME chapter
.SH NAME
diff --git a/src/osd/sdl/man/testkeys.1 b/src/osd/sdl/man/testkeys.1
index 34ee6b0e1af..2cea7aa53f8 100644
--- a/src/osd/sdl/man/testkeys.1
+++ b/src/osd/sdl/man/testkeys.1
@@ -5,7 +5,7 @@
.\" Man page created from source and usage information
.\" Cesare Falco <c.falco@ubuntu.com>, February 2007
.\"
-.TH TESTKEYS 1 2014-11-19 0.156 "MAME SDL keycode scanner"
+.TH TESTKEYS 1 2014-12-15 0.157 "MAME SDL keycode scanner"
.\"
.\" NAME chapter
.SH NAME