wm4 84829a4ea1 Merge branch 'osd_changes' into master ... Conflicts: DOCS/man/en/options.rst		2012-11-01 02:12:47 +01:00
..
appleir.c	input: move all key code lists to input/keycodes.h	2011-05-02 00:43:31 +03:00
ar.c	input/ar.c, input/lirc.c: fix changes missing from 1916b95b8	2011-09-04 08:04:31 +03:00
ar.h	cleanup: remove some unnecessary input.[ch] typedefs	2011-07-16 21:32:37 +03:00
input.c	Merge branch 'osd_changes' into master	2012-11-01 02:12:47 +01:00
input.h	input: add input test mode	2012-10-14 22:28:51 +02:00
joystick.c	input/joystick.c: add #include missing from 23cb829072	2011-05-03 13:26:30 +03:00
joystick.h	input: move all key code lists to input/keycodes.h	2011-05-02 00:43:31 +03:00
keycodes.h	win32: support key modifiers (shift, ctrl, alt)	2012-04-06 23:56:30 +02:00
lirc.c	Rename to "mpv"	2012-10-12 10:14:32 +02:00
lirc.h	cleanup: remove some unnecessary input.[ch] typedefs	2011-07-16 21:32:37 +03:00