[FFmpeg-cvslog] [ffmpeg-web] branch master updated. b999a39 web: Move the multimedia wiki link to the documentation.

[gitolite]

The branch, master has been updated
       via  b999a39fbd28fd4ae3c9da0ec36d89c28626badf (commit)
      from  ecd014391debb0cd1d757ccc367fbce6c38d30ac (commit)


- Log -----------------------------------------------------------------
commit b999a39fbd28fd4ae3c9da0ec36d89c28626badf
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Thu Jan 12 20:22:31 2012 +0100
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Thu Jan 12 20:25:17 2012 +0100

    web: Move the multimedia wiki link to the documentation.

diff --git a/src/documentation b/src/documentation
index 97e1722..b597f5f 100644
--- a/src/documentation
+++ b/src/documentation
@@ -18,6 +18,7 @@ discusses all issues regarding FFmpeg under Windows including a wiki
 and help forums.</li>
 <li><a href="http://stephenjungels.com/jungels.net/articles/ffmpeg-howto.html">FFmpeg on Mac OS X HOWTO</a>
 explains installing and using FFmpeg on Mac OS X.</li>
+<li><a href="http://wiki.multimedia.cx/">MultimediaWiki</a></li>
 </ul>
 
 <h2>Command Line Interface (CLI) and Related Usage Documentation</h2>
diff --git a/src/template_head2 b/src/template_head2
index 535e7c6..63f27ea 100644
--- a/src/template_head2
+++ b/src/template_head2
@@ -22,8 +22,7 @@
 <a href="contact.html">Contact</a> |
 <a href="consulting.html">Consulting</a> |
 <a href="projects.html">Projects</a> |
-<a href="legal.html">Legal</a> |
-<a href="http://wiki.multimedia.cx/">Wiki</a> |
+<a href="legal.html">Legal</a>
 </div>
 
 <div id="body">

-----------------------------------------------------------------------

Summary of changes:
 src/documentation  |    1 +
 src/template_head2 |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
--