diff options
| author | kraymer <kraymer@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-28 02:20:48 +0000 |
|---|---|---|
| committer | kraymer <kraymer@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-28 02:20:48 +0000 |
| commit | d3362f70686fd9126df82b3fcc362dfd77b447fb (patch) | |
| tree | 6094556f7ee67374bc49bafef5a9026830b4c0b6 /DOCS/xml/de/documentation.xml | |
| parent | c6dffa6cf04ec4cca6772b702b15c91417ddb0c1 (diff) | |
| download | mpv-d3362f70686fd9126df82b3fcc362dfd77b447fb.tar.bz2 mpv-d3362f70686fd9126df82b3fcc362dfd77b447fb.tar.xz | |
r23578: Fix license header.
r23579: Activate license notice.
r23594: added some carriage returns and full stops, plus a missing 'option'
r23608: Nico claims to never have had any problems with X11 compilation on Mandrake.
r23983: i_certify_that_my_video_stream_does_not_use_b_frames is gone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24644 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS/xml/de/documentation.xml')
| -rw-r--r-- | DOCS/xml/de/documentation.xml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/DOCS/xml/de/documentation.xml b/DOCS/xml/de/documentation.xml index 0a65e660ce..8c32f2b8c3 100644 --- a/DOCS/xml/de/documentation.xml +++ b/DOCS/xml/de/documentation.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- in sync with r21537 --> +<!-- in sync with r23579 --> <!-- missing cosmetic commit 21537 --> <bookinfo id="toc"> <title><application>MPlayer</application> - Movie Player</title> @@ -18,24 +18,22 @@ <year>2007</year> <holder>MPlayer-Team</holder> </copyright> - <!-- <legalnotice> <title>License</title> - <para>This program is free software; you can redistribute it and/or modify + <para>MPlayer is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</para> - <para>This program is distributed in the hope that it will be useful, but + <para>MPlayer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</para> <para>You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, + along with MPlayer; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</para> </legalnotice> - --> </bookinfo> |