[SCM] mplayer2/master: Merge tag 'upstream/2.0-701-gd4c5b7f'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.0-701-gd4c5b7f
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3631bc302c5ba04786da1fcf8fc68321f360d447
X-Git-Newrev: b93f68247629dbc9b799e6710005d50d7998ab2f

The following commit has been merged in the master branch:
commit 74ee6628db9d1723ad49f1dd3b5411b5f0784fca
Merge: 3631bc302c5ba04786da1fcf8fc68321f360d447 e81201c1771af89e668ef0a2d273248ab02503ff
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 20 16:41:12 2013 +0100

    Merge tag 'upstream/2.0-701-gd4c5b7f'
    
    Upstream version 2.0-701-gd4c5b7f

diff --combined .gitignore
index d292a51,e5ae752..509ed0a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  *.o
  *.a
  *.d
@@@ -8,6 -7,7 +8,7 @@@
  /config.mak
  /config.log
  /mplayer
+ /mplayer2.app
  /version.h
  /codecs.conf.h
  /codec-cfg

-- 
mplayer2 packaging