summaryrefslogtreecommitdiffstats
path: root/DOCS/tech
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-07 19:57:57 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-07 19:57:57 +0300
commitaf3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch)
tree2ead158ae6e6abfffcccf1609aa5492f9402e24f /DOCS/tech
parentd5c868325cefcd5fad53361d1dfdc9757674eb70 (diff)
parent4653f5ed7575d6070b54a88b4deb449f838825b3 (diff)
downloadmpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2
mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz
Merge svn changes up to r27025
Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
Diffstat (limited to 'DOCS/tech')
-rw-r--r--DOCS/tech/svn-howto.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt
index 9fdaa7853f..79bfa82057 100644
--- a/DOCS/tech/svn-howto.txt
+++ b/DOCS/tech/svn-howto.txt
@@ -306,7 +306,6 @@ II. POLICY / RULES:
- changes to "historical" parts of docs and web pages
- use of internal or external libraries
- reverting commits from other developers
- - mixing functional and cosmetic changes
- making the spelling of words consistent without actually correcting
any spelling errors.