wm4 97ac824124 Merge remote-tracking branch 'origin/master' ... Conflicts: bstr.c bstr.h libvo/cocoa_common.m libvo/gl_common.c libvo/video_out.c mplayer.c screenshot.c sub/subassconvert.c Merge of cocoa_common.m done by pigoz. Picking my version of screenshot.c. The fix in commit aadf1002f8 will be redone in a follow-up commit, as the original commit causes too many conflicts with the work done locally in this branch, and other work in progress.		2012-04-29 10:01:28 +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-29 10:01:28 +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	win32: support key modifiers (shift, ctrl, alt)	2012-04-06 23:56:30 +02: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