From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 6 Sep 2019 08:56:11 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into release/1.35.2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=fb4e5f02481e918807be83e87239a4d91b4343f2;p=simantics%2Fdistrict.git

Merge remote-tracking branch 'origin/master' into release/1.35.2

Conflicts resolved:
	org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
	org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
	org.simantics.district.network.ontology/graph/DistrictNetworkProfiles.pgraph
	org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
	org.simantics.district.network.ui/META-INF/MANIFEST.MF
	org.simantics.district.network.ui/adapters.xml
	org.simantics.district.network.ui/fragment.e4xmi
	org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictTransformUtil.java
	org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/NetworkElementActionMenuContribution.java
	org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
	org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java
	org.simantics.district.network/scl/Simantics/District/Algorithm.scl
	org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
	org.simantics.district.network/src/org/simantics/district/network/profile/ArrowLengthStyle.java

gitlab #60
---

fb4e5f02481e918807be83e87239a4d91b4343f2