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)
commitfdbe87627e92805701d0672fbe8f1dc60b7f7b00
treed919a185cb1a3e21477430e0a9d9e2b149bddb2d
parent44aad224019ae24aa4a519da3838c9b7d1a79035
parentbf75fd9740858140eac90c18f0bca0aea3893248
Merge commit 'bf75fd9'

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

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