diff options
| author |   eroen <eroen-overlay@occam.eroen.eu> | 2016-10-14 23:07:58 +0200 |
|---|---|---|
| committer | eroen <eroen-overlay@occam.eroen.eu> | 2016-10-14 23:07:58 +0200 |
| commit | 6a9149a7eb0ef139ab78070fe52d04b8c3f37397 (patch) | |
| tree | 34c77b9a47e03c59f28af0cf63ea037907d931ac /media-gfx | |
| parent | profiles - Override stable no-multilib profiles (diff) | |
| download | eroen-6a9149a7eb0ef139ab78070fe52d04b8c3f37397.tar.gz eroen-6a9149a7eb0ef139ab78070fe52d04b8c3f37397.tar.bz2 eroen-6a9149a7eb0ef139ab78070fe52d04b8c3f37397.zip | |
cleanup
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/blender/metadata.xml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index de9644e..a8ee785 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -7,12 +7,9 @@ </longdescription> <use> -<<<<<<< current -======= - <flag name="blender-game" restrict="<=media-gfx/blender-2.50"> + <flag name="blender-game"> Adds Game Engine support to Blender. </flag> ->>>>>>> patched <flag name="game-engine" restrict=">=media-gfx/blender-2.50"> Adds Game Engine support to Blender. </flag> @@ -20,12 +17,9 @@ Add support for Collada interchange format through <pkg>media-libs/opencollada</pkg>. </flag> -<<<<<<< current -======= <flag name='verse'> Adds verse clustering features to Blender. </flag> ->>>>>>> patched <flag name="cycles"> Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and <pkg>dev-libs/boost</pkg>). |