[SCM] mplayer2/master: Switch from 'mplayer-build' tree style to standalone tree

[siretart at users.alioth.debian.org]

Imported Upstream version 2.0-134-g84d8671
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9e8d047d110c9716fbc01ba0f4f1c88e8d611b3c
X-Git-Newrev: 40858eb3c43d33680cdd2c61c942b1f18b688547

The following commit has been merged in the master branch:
commit 415403975ad7b30b9868f159f3a40e9d882c5137
Merge: 9e8d047d110c9716fbc01ba0f4f1c88e8d611b3c 3a2588a0ff4832f6100a3e0a8706af796221d7be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 19 10:08:08 2011 +0200

    Switch from 'mplayer-build' tree style to standalone tree
    
    Merges commit 'upstream/2.0-134-g84d8671'
    
    Conflicts:
    	.gitignore
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/rules

diff --combined .gitignore
index 0dc7c6e,e902393..72d5480
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,19 +1,20 @@@
- *.pyc
- /build_libs
- /common_options
- /ffmpeg_options
- /mplayer_options
- /ffmpeg_build
- /ffmpeg-mt-enabled
- /ffmpeg-mt-disabled
 +/.pc
+ *.o
+ *.a
+ *.d
+ .depend
+ 
+ /config.h
+ /config.mak
+ /config.log
+ /mplayer
+ /version.h
+ /codecs.conf.h
+ /codec-cfg
+ /codec-cfg-test
+ /codecs2html
+ /cpuinfo
+ /tags
+ /TAGS
+ /locale
+ /po

-- 
mplayer2 packaging