wm4 1aa2e36122 Merge remote-tracking branch 'origin/master' ... Conflicts: bstr.c bstr.h etc/input.conf input/input.c input/input.h libao2/ao_pulse.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c libvo/gl_common.c libvo/x11_common.c mixer.c mixer.h mplayer.c		2012-04-01 22:52:33 +02: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'	2012-04-01 22:52:33 +02:00
input.h	Merge remote-tracking branch 'origin/master'	2012-04-01 22:52:33 +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	x11: input: add print and menu keys	2012-03-25 22:30:37 +03: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