diff options
| author |   Sebastian Bergmann <sebastian@gentoo.org> | 2005-05-12 13:22:39 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@gentoo.org> | 2005-05-12 13:22:39 +0000 |
| commit | 71bb6a24a1e558825d028de9837e10035164c2f7 (patch) | |
| tree | bd63c2a5f2f1545250a8a5d09c5684fe3db2af7b /profiles/use.local.desc | |
| parent | Stable on ppc (diff) | |
| download | gentoo-2-71bb6a24a1e558825d028de9837e10035164c2f7.tar.gz gentoo-2-71bb6a24a1e558825d028de9837e10035164c2f7.tar.bz2 gentoo-2-71bb6a24a1e558825d028de9837e10035164c2f7.zip | |
Remove conflict markers.
Diffstat (limited to 'profiles/use.local.desc')
| -rw-r--r-- | profiles/use.local.desc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 6ee206c307c7..790c3c1845a7 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.1161 2005/05/12 10:46:05 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.1162 2005/05/12 13:22:39 sebastian Exp $ # This file contains descriptions of local USE flags, and the ebuilds which # contain them. @@ -236,11 +236,8 @@ dev-python/cgkit:ogre - enable support for Ogre rendering dev-python/docutils:glep - Install support for GLEPs dev-python/epydoc:pdf - enable support for exporting to pdf dev-python/ipython:gnuplot - enable gnuplot support -<<<<<<< use.local.desc dev-python/numeric:lapack - enable lapack library support -======= dev-python/pycairo:numeric - enable Numeric support ->>>>>>> 1.1016 dev-python/pykde:kjs - include the kjs module (don't enable, if unsure) dev-python/soya:ode - include support for Open Dynamics Engine dev-ruby/ruby-sdl:image - enable sdl-image support |