]> gerrit.simantics Code Review - simantics/district.git/commit
Code Review / simantics / district.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(merge: 377e9f4 822d56c)
Merge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1 93/2693/4
authorReino Ruusu <reino.ruusu@semantum.fi>
Mon, 25 Feb 2019 10:18:57 +0000 (12:18 +0200)
committerReino Ruusu <reino.ruusu@semantum.fi>
Mon, 4 Mar 2019 09:41:07 +0000 (09:41 +0000)
commitc8dfe51eb12b74f1dd0ad6f3e13f70bf368e8dc9
tree32ea98708ae973a892370b0ee21fc9a97b36ab59tree | snapshot
parent377e9f40e4a6b30f32e3fd15464072e4b7732f6acommit | diff
parent822d56c9136c7866a3f6487493bfd11fe5022dbfcommit | diff
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
pom.xml diff1 | diff2 | blob | history
Simantics District Modelling components.