]> gerrit.simantics Code Review - simantics/platform.git/commit
Merge remote-tracking branch 'origin/master' into private/antti2 private/antti2
authorAntti Villberg <antti.villberg@semantum.fi>
Sat, 11 Jan 2020 10:54:22 +0000 (12:54 +0200)
committerAntti Villberg <antti.villberg@semantum.fi>
Sat, 11 Jan 2020 10:54:22 +0000 (12:54 +0200)
commitee8f590cd00bf1f046062f623b024f26ef17f4e1
tree18254836efc5f4241780d2b80f26dc05c59317f5
parent63369acd7e6020a2148f40f6bab96b0b2ba392d8
parentb8e4909d7723ad4bffcae324ade14d94d837e6da
Merge remote-tracking branch 'origin/master' into private/antti2

Conflicts:
bundles/org.simantics.acorn/src/org/simantics/acorn/OperationQueue.java
bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfo.java
bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardVariableBuilder.java

Change-Id: I5a4cbd88743669fa4b1104ec466c0efa3aa0aa3d
bundles/org.simantics.acorn/src/org/simantics/acorn/OperationQueue.java
bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfo.java