From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 30 Sep 2016 08:06:06 +0000 (+0300)
Subject: Merge commit 'bf75fd9'
X-Git-Tag: v1.25.0~80
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=fdbe87627e92805701d0672fbe8f1dc60b7f7b00;hp=--cc;ds=sidebyside

Merge commit 'bf75fd9'

Resolved conflicts:
	bundles/org.simantics.charts/src/org/simantics/charts/Charts.java

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

fdbe87627e92805701d0672fbe8f1dc60b7f7b00