diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
| commit | 90f5873f1a4b528dc245beb75b834c52ef04b3db (patch) | |
| tree | 9ede9db5ad14d812f1211510b9e48ea11c915458 /DOCS | |
| parent | 15a604c405cb53054853cdc426e124936d6321d8 (diff) | |
| parent | 8ba6b4eaf939f34ac34993aa225143b4102f6c02 (diff) | |
| download | mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.bz2 mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.xz | |
Merge svn changes up to r30675
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/tech/code-documentation.txt | 2 | ||||
| -rw-r--r-- | DOCS/tech/mirrors/update_mplayer_rsync | 1 | ||||
| -rw-r--r-- | DOCS/tech/osd.txt | 1 | ||||
| -rw-r--r-- | DOCS/tech/realcodecs/streaming.txt | 2 | ||||
| -rw-r--r-- | DOCS/tech/release-howto.txt | 1 | ||||
| -rw-r--r-- | DOCS/tech/wishlist | 1 | ||||
| -rw-r--r-- | DOCS/xml/cs/faq.xml | 1 |
7 files changed, 0 insertions, 9 deletions
diff --git a/DOCS/tech/code-documentation.txt b/DOCS/tech/code-documentation.txt index b3d024e85a..9213a79715 100644 --- a/DOCS/tech/code-documentation.txt +++ b/DOCS/tech/code-documentation.txt @@ -130,5 +130,3 @@ There are a couple of special tags for doxygen: For a complete list of tags please read section 20 "Special commands" of the doxygen manual. - - diff --git a/DOCS/tech/mirrors/update_mplayer_rsync b/DOCS/tech/mirrors/update_mplayer_rsync index 7d4890cce3..cafaabe594 100644 --- a/DOCS/tech/mirrors/update_mplayer_rsync +++ b/DOCS/tech/mirrors/update_mplayer_rsync @@ -36,4 +36,3 @@ then mailx -s "MPlayer mirror" $MAILADR < $TMPFILE fi rm -f $TMPFILE - diff --git a/DOCS/tech/osd.txt b/DOCS/tech/osd.txt index f5cf7f37c0..e4af53fe09 100644 --- a/DOCS/tech/osd.txt +++ b/DOCS/tech/osd.txt @@ -84,4 +84,3 @@ typedef struct mp_osd_obj_s { } group; } params; } mp_osd_obj_t; - diff --git a/DOCS/tech/realcodecs/streaming.txt b/DOCS/tech/realcodecs/streaming.txt index 3761c04b5a..091d0d671f 100644 --- a/DOCS/tech/realcodecs/streaming.txt +++ b/DOCS/tech/realcodecs/streaming.txt @@ -56,5 +56,3 @@ ulong blocksize ushort streamid uchar reserved uchar flags 1=reliable, 2=keyframe - - diff --git a/DOCS/tech/release-howto.txt b/DOCS/tech/release-howto.txt index b490f80283..403370b125 100644 --- a/DOCS/tech/release-howto.txt +++ b/DOCS/tech/release-howto.txt @@ -58,4 +58,3 @@ Update release version in #mplayer topic Update project page on Freshmeat Done. - diff --git a/DOCS/tech/wishlist b/DOCS/tech/wishlist index 2206b20f8e..90a3619974 100644 --- a/DOCS/tech/wishlist +++ b/DOCS/tech/wishlist @@ -179,4 +179,3 @@ Difficult stuff: * encode and display video at the same time * write mpimage for displaying pictures - diff --git a/DOCS/xml/cs/faq.xml b/DOCS/xml/cs/faq.xml index 2eb8fbbce7..fbea20297f 100644 --- a/DOCS/xml/cs/faq.xml +++ b/DOCS/xml/cs/faq.xml @@ -1293,4 +1293,3 @@ v souboru <filename>TOOLS/README</filename>. </qandaset> </chapter> - |