]> gerrit.simantics Code Review - simantics/platform.git/commitdiff
Code Review / simantics / platform.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 44aad22 bf75fd9)
Merge commit 'bf75fd9'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 30 Sep 2016 08:06:06 +0000 (11:06 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 30 Sep 2016 08:06:32 +0000 (11:06 +0300)
Resolved conflicts:
bundles/org.simantics.charts/src/org/simantics/charts/Charts.java

refs #6724
refs #6723
refs #6704
refs #6495


Trivial merge
Simantics Platform SDK.