summaryrefslogtreecommitdiffstats
path: root/DOCS/tech
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-23 03:58:44 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-23 03:58:44 +0300
commitde560e8167c21a8fd9ea34f5f42f377102d65232 (patch)
treed5ef49221ccbb17308b0d14a96e6bd8cfba5916f /DOCS/tech
parent68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff)
parent5eee4632d3e2bcf17a29483467d247c71c202e0d (diff)
downloadmpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2
mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz
Merge svn changes up to r27123
Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
Diffstat (limited to 'DOCS/tech')
-rw-r--r--DOCS/tech/slave.txt16
-rw-r--r--DOCS/tech/svn-howto.txt2
2 files changed, 10 insertions, 8 deletions
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt
index 080f7fa880..051920b89c 100644
--- a/DOCS/tech/slave.txt
+++ b/DOCS/tech/slave.txt
@@ -66,14 +66,16 @@ change_rectangle <val1> <val2>
dvb_set_channel <channel_number> <card_number>
Set DVB channel.
-dvdnav <button>
+dvdnav <button_name>
Press the given dvdnav button.
- 1 up
- 2 down
- 3 left
- 4 right
- 5 menu
- 6 select
+ up
+ down
+ left
+ right
+ menu
+ select
+ prev
+ mouse
edl_mark
Write the current position into the EDL file.
diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt
index 79bfa82057..ee93f9ed71 100644
--- a/DOCS/tech/svn-howto.txt
+++ b/DOCS/tech/svn-howto.txt
@@ -104,7 +104,7 @@ I. BASICS:
For cosmetics-only commits you should get (almost) empty output from
- svn diff --diff-cmd diff -x '-duwbB' <filename(s)>
+ svn diff --diff-cmd diff -x '-duwbBE' <filename(s)>
Also check the output of