Merge commit '876ede6'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 6 Dec 2016 12:33:30 +0000 (14:33 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 6 Dec 2016 12:33:30 +0000 (14:33 +0200)
commit06718abb2b3cc780748553811c4857c165499809
tree529e1aad3c63143acf6f420e41f26be617d24b7b
parentf992cbbaa65e3457d53ecf03180de98c684e091c
parent876ede6b867e2e7966ffb46cc69dc820969c4394
Merge commit '876ede6'

Conflicts:
bundles/org.simantics.acorn/build.properties
bundles/org.simantics.charts/META-INF/MANIFEST.MF
features/org.simantics.acorn.feature/.project