From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 10 Nov 2016 21:45:11 +0000 (+0200)
Subject: Merge commit 'c46f0ff'
X-Git-Tag: v1.25.0~54
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=c08364c64a0bb53c45c052a3e4cea8702bbd69a0;hp=bb5a3edf299cb943999c72c69dd68fb740c8a506;p=simantics%2Fplatform.git

Merge commit 'c46f0ff'

Sync git svn branch with SVN repository r33386.

refs #6803
[PRIVATE-12714]
---

diff --git a/bundles/org.simantics.annotation.ontology/graph.tg b/bundles/org.simantics.annotation.ontology/graph.tg
index 2898f0084..ee0a514db 100644
Binary files a/bundles/org.simantics.annotation.ontology/graph.tg and b/bundles/org.simantics.annotation.ontology/graph.tg differ
diff --git a/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph b/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph
index 2a9827acb..ba82a1d60 100644
--- a/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph
+++ b/bundles/org.simantics.annotation.ontology/graph/Annotation.pgraph
@@ -23,7 +23,7 @@ ANNO.AnnotationType <T L0.Type : MOD.TypeWithChangeInformation
     >-- ANNO.AnnotationType.systemAnnotation ==> "Boolean" <R L0.HasProperty : L0.FunctionalRelation : SEL.GenericParameterType
         L0.HasLabel "Is System Annotation?"
         L0.HasDescription "If true, this annotation type and its instances should be hidden from user interfaces while still allowing programmatic use."
-    @L0.assert ANNO.AnnotationType.systemAnnotation true
+    @L0.assert ANNO.AnnotationType.systemAnnotation false
 
 ANNO.Annotation <T L0.Value : ANNO.AnnotationType : MOD.TypeWithChangeInformation
     L0.HasDescription "Abstract base class for annotation object types."