wm4 84829a4ea1 Merge branch 'osd_changes' into master ... Conflicts: DOCS/man/en/options.rst		2012-11-01 02:12:47 +01:00
..
codecs.conf	codecs.conf: cleanup: remove stale entry	2012-10-30 19:50:24 +01: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	Merge branch 'osd_changes' into master	2012-11-01 02:12:47 +01: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