summaryrefslogtreecommitdiffstats
path: root/DOCS/tech
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:04:43 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:13:09 +0300
commit17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch)
tree5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /DOCS/tech
parent2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff)
parentaf76be6e197382af491fadef3fcf821a721c99f5 (diff)
downloadmpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2
mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz
Merge svn changes up to r27441
Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
Diffstat (limited to 'DOCS/tech')
-rw-r--r--DOCS/tech/MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 96e58a60b2..3ef66d8b6d 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -187,6 +187,7 @@ libvo drivers:
* vo_tdfxfb.c - Alban Bedel
* vo_tga.c - Daniele Forghieri
* vo_vesa.c - Aurelien Jacobs
+ * vo_wii.c - Benjamin Zores
* vo_winvidix.c - Sascha Sommer
* vo_x11.c - Alexander Strasser
* vo_xmga.c - Attila Kinali