summaryrefslogtreecommitdiff
path: root/media-gfx/blender/metadata.xml
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/blender/metadata.xml')
-rw-r--r--media-gfx/blender/metadata.xml8
1 files changed, 1 insertions, 7 deletions
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index de9644ec..a8ee7850 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="&lt;=media-gfx/blender-2.50">
+ <flag name="blender-game">
Adds Game Engine support to Blender.
</flag>
->>>>>>> patched
<flag name="game-engine" restrict="&gt;=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>).