From: Marko Luukkainen Date: Mon, 13 Jan 2020 13:57:22 +0000 (+0000) Subject: Merge "TransferableGraph import to VG with different name" X-Git-Tag: v1.43.0~136^2~5 X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=50dee4ff8fd82c2e6ad78246b5b1f6880865a3e8;hp=55feb8ea3a74bf5ce73619d62d4c73e576ae89fc Merge "TransferableGraph import to VG with different name" --- diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target index c21ef491a..bbb4defd9 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target @@ -1,7 +1,7 @@ - + @@ -148,20 +148,20 @@ - - - - - - - - - - - + + + + + + + + + + + - + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd index e386cca5f..7b1ce22c0 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd @@ -146,7 +146,7 @@ location "http://www.simantics.org/update/nebula/releases/2.2.0/release/" { org.eclipse.nebula.widgets.xviewer.feature.feature.group } -location "http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/" { +location "http://www.simantics.org/update/nebula/nattable/releases/1.6.0/repository/" { org.eclipse.nebula.widgets.nattable.core.feature.feature.group org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 51d63fb3b..529902e27 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -1,7 +1,7 @@ - - + + @@ -146,17 +146,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd index db5848b49..2dd168a4a 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd @@ -144,7 +144,7 @@ location "http://www.simantics.org/update/nebula/releases/2.2.0/release/" { org.eclipse.nebula.widgets.xviewer.feature.feature.group } -location "http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/" { +location "http://www.simantics.org/update/nebula/nattable/releases/1.6.0/repository/" { org.eclipse.nebula.widgets.nattable.core.feature.feature.group org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target index e70429269..2a2f99575 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -160,16 +160,16 @@ - + - + - + @@ -395,16 +395,16 @@ - + - + - + \ No newline at end of file diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd index dda61631a..6228efd13 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd @@ -1,4 +1,4 @@ -target "Simantics 1.41.0" +target "Simantics 1.42.0" with source allEnvironments diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index 4f55a9595..974ebb718 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,7 +1,7 @@ - - + + @@ -146,17 +146,17 @@ - - - - - - - - - - - + + + + + + + + + + +