wm4 51e198c2a1 Merge remote-tracking branch 'origin/master' ... Conflicts: .gitignore bstr.c cfg-mplayer.h defaultopts.c libvo/video_out.c The conflict in bstr.c is due to uau adding a bstr_getline function in commit 2ba8b91a97. This function already existed in this branch. While uau's function is obviously derived from mine, it's incompatible. His function preserves line breaks, while mine strips them. Add a bstr_strip_linebreaks function, fix all other uses of bstr_getline, and pick uau's implementation. In .gitignore, change vo_gl3_shaders.h to use an absolute path additional to resolving the merge conflict.		2012-07-28 17:24:05 +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-07-28 17:24:05 +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