wm4 0e81d62c53 Merge branch 'master' into osd_changes ... Conflicts: libvo/vo_xv.c		2012-10-24 22:38:45 +02:00
..
codecs.conf	codecs: add Video Decode Acceleration Framework codec	2012-10-16 07:19:32 +02:00
encoding-example-profiles.conf	Rename to "mpv"	2012-10-12 10:14:32 +02:00
example.conf	Rename to "mpv"	2012-10-12 10:14:32 +02:00
input.conf	screenshot: change "screenshot" input command	2012-10-24 21:56:34 +02:00
inttypes.h
mplayer.ico
mplayer.xpm
mpv-icon-source.svg	TOOLS: add script for osx bundle generation	2012-10-16 07:15:12 +02:00