From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Mon, 25 Feb 2019 10:18:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=c8dfe51eb12b74f1dd0ad6f3e13f70bf368e8dc9;p=simantics%2Fdistrict.git

Merge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1

Conflicts:
	org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java

Change-Id: I2780355701d80fc5dc992442209f614136e3c9db
---

c8dfe51eb12b74f1dd0ad6f3e13f70bf368e8dc9
diff --cc pom.xml
index 8376b38f,7834a65a..720e49f4
--- a/pom.xml
+++ b/pom.xml
@@@ -8,7 -8,7 +8,7 @@@
  
  	<!-- common settings for all modules -->
  	<properties>
- 		<branch-spec>release/1.35.0</branch-spec>
 -		<branch-spec>master</branch-spec>
++		<branch-spec>release/1.35.1</branch-spec>
  		<simantics-download-site>http://www.simantics.org/download</simantics-download-site>
  		<tycho-version>1.0.0</tycho-version>
  	</properties>