]> gerrit.simantics Code Review - simantics/platform.git/commitdiff
Code Review / simantics / platform.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 321dbee)
Adding missing HasTypes for background compatibility
authorjsimomaa <jani.simomaa@gmail.com>
Fri, 20 Jan 2017 11:44:23 +0000 (13:44 +0200)
committerjsimomaa <jani.simomaa@gmail.com>
Fri, 28 Apr 2017 13:32:03 +0000 (16:32 +0300)
Change-Id: If1903c1fca4f14ecbc99797001f9d752c24c7787

bundles/org.simantics.selectionview.ontology/graph.tg patch | blob | history
bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph patch | blob | history

diff --git a/bundles/org.simantics.selectionview.ontology/graph.tg b/bundles/org.simantics.selectionview.ontology/graph.tg
index 7aa0ecdb2244680407b97f78fd5742e2878df419..440de44ea72802d999bc17296a9d94878789f68b 100644 (file)
Binary files a/bundles/org.simantics.selectionview.ontology/graph.tg and b/bundles/org.simantics.selectionview.ontology/graph.tg differ
diff --git a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
index 4275aa54b337a01301fa573ddc6d0d4dc0de9c44..8396e6cd4e4a8177647b53ef22fc48439221ccbb 100644 (file)
--- a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
+++ b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
@@ -32,6 +32,7 @@ SEL.AbstractVariableTabContribution <T SEL.TabContribution
 SEL.AbstractResourceTabContribution <T SEL.TabContribution
 
 SEL.AbstractTypedVariableTabContribution <T SEL.AbstractVariableTabContribution
+  >-- SEL.AbstractTypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
 
 SEL.AbstractTypedResourceTabContribution <T SEL.AbstractResourceTabContribution
 
@@ -46,10 +47,14 @@ SEL.MultiTypedVariableTabContribution <T SEL.TypedVariableTabContribution
   @L0.assert SEL.TabContribution.Multi true
 
 SEL.TypedVariableTabContribution <T SEL.VariableTabContribution
+<<<<<<< Upstream, based on branch 'private/jsimomaa-district' of ssh://jsimomaa@www.simantics.org:29418/simantics/platform
 <<<<<<< Upstream, based on branch 'private/jsimomaa-district' of ssh://jsimomaa@www.simantics.org:29418/simantics/platform
   >-- SEL.TypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
 =======
 >>>>>>> 0ae9719 Enhancements to TabContributions
+=======
+  >-- SEL.TypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
+>>>>>>> d930828 Adding missing HasTypes for background compatibility
 
 SEL.HasDisplayColumn <R L0.HasProperty : L0.FunctionalRelation
 
Simantics Platform SDK.