diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2004-06-30 18:27:39 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2004-06-30 18:27:39 +0000 |
| commit | 8e7d4a98109f4fd046dc69bb1e9828c07a8d744c (patch) | |
| tree | dcf1d42317b3e8086e126f46ba00a4e4da04120e /profiles | |
| parent | Version bump, ARCH fix, xbox support (Manifest recommit) (diff) | |
| download | gentoo-2-8e7d4a98109f4fd046dc69bb1e9828c07a8d744c.tar.gz gentoo-2-8e7d4a98109f4fd046dc69bb1e9828c07a8d744c.tar.bz2 gentoo-2-8e7d4a98109f4fd046dc69bb1e9828c07a8d744c.zip | |
removing a cvs conflict <<<<< blar >>>>> blah2 that luke-jr pointed out.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/use.local.desc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/profiles/use.local.desc b/profiles/use.local.desc index c8594c86618b..b203b33283d2 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.455 2004/06/28 17:15:52 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.456 2004/06/30 18:27:39 ferringb Exp $ # This file contains descriptions of local USE flags, and the ebuilds which # contain them. @@ -273,12 +273,8 @@ media-video/mplayer:live - Enables live.com streaming media support media-video/mplayer:matroska - Use external libmatroska, rather then bundled version media-video/mplayer:v4l - Enables video4linux support media-video/mplayer:v4l2 - Enables video4linux2 support -<<<<<<< use.local.desc -media-video/tcvp:ffmpeg - Enable ffmpeg support -======= media-video/tcvp:faad - Enables faad2 support media-video/tcvp:ffmpeg - Enable ffmpeg support ->>>>>>> 1.439 media-video/vlc:faad - Enables faad2 support media-video/vlc:matroska - Enables support for the matroska video format media-video/vlc:v4l - Enables video4linux support |