summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:47:25 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:47:25 +0200
commit90f5873f1a4b528dc245beb75b834c52ef04b3db (patch)
tree9ede9db5ad14d812f1211510b9e48ea11c915458 /etc
parent15a604c405cb53054853cdc426e124936d6321d8 (diff)
parent8ba6b4eaf939f34ac34993aa225143b4102f6c02 (diff)
downloadmpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.bz2
mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.xz
Merge svn changes up to r30675
Diffstat (limited to 'etc')
-rw-r--r--etc/dvb-menu.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/etc/dvb-menu.conf b/etc/dvb-menu.conf
index 3fd0d11aaa..7da289048e 100644
--- a/etc/dvb-menu.conf
+++ b/etc/dvb-menu.conf
@@ -104,5 +104,3 @@
<e name="Console" ok="set_menu console0"/>
<e name="Quit" ok="quit"/>
</cmdlist>
-
-