wm4 6de8120822 Merge remote-tracking branch 'origin/master' into my_master ... Conflicts: command.c mp_core.h mplayer.c screenshot.c		2012-03-16 19:14:44 +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 remote-tracking branch 'origin/master' into my_master	2012-03-16 19:14:44 +01:00
input.h	commands: add pt_clear command to clear playlist	2012-02-10 19:14:19 +01: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	x11: add print and menu keys	2012-01-18 04:13:27 +01:00
lirc.c	input/ar.c, input/lirc.c: fix changes missing from 1916b95b8	2011-09-04 08:04:31 +03:00
lirc.h	cleanup: remove some unnecessary input.[ch] typedefs	2011-07-16 21:32:37 +03:00