[SCM] mplayer2/master: Merge tag 'upstream/2.0-665-gb5349bb'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.0-665-gb5349bb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9e0d3f68ea802b7ebbd16567e69ffeb5c8e0c416
X-Git-Newrev: f1b7dfd7d7291a8d0572ea375d7a5d6a569b3801

The following commit has been merged in the master branch:
commit efb6b9ac08a3a10ba1558d8558aeb7dd3ccc412f
Merge: 9e0d3f68ea802b7ebbd16567e69ffeb5c8e0c416 3601ca0412ecba6ef9e05764072d87d3a729939f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 18 19:47:11 2012 +0100

    Merge tag 'upstream/2.0-665-gb5349bb'
    
    Upstream version 2.0-665-gb5349bb

diff --combined .gitignore
index 72d5480,427ccb2..d292a51
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  *.o
  *.a
  *.d
@@@ -11,10 -10,15 +11,15 @@@
  /version.h
  /codecs.conf.h
  /codec-cfg
- /codec-cfg-test
- /codecs2html
  /cpuinfo
  /tags
  /TAGS
  /locale
  /po
+ /DOCS/man/*/mplayer.1
+ /input/input.conf.h
+ /libmpdemux/ebml_defs.c
+ /libmpdemux/ebml_types.h
+ /libvo/vdpau_template.c
+ /libvo/vo_gl3_shaders.h
+ /sub/osd_font.h

-- 
mplayer2 packaging