Uoti Urpala ebb4abf208 Merge svn changes up to r27682 ...

Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.

Conflicts:
	command.c
	mplayer.c

2008-10-02 05:17:23 +03:00

..

appleir.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ar.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

ar.h

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

input.c

Merge svn changes up to r27682

2008-10-02 05:17:23 +03:00

input.h

Move some declarations from mplayer.c to proper headers

2008-08-12 14:57:18 +03:00

joystick.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

joystick.h

input: Remove separate mp_input_add_event_fd

2008-04-29 12:55:23 +03:00

lirc.c

…

lirc.h

…

mouse.h

…