]> 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: f992cbb 876ede6)
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)
Conflicts:
bundles/org.simantics.acorn/build.properties
bundles/org.simantics.charts/META-INF/MANIFEST.MF
features/org.simantics.acorn.feature/.project


Trivial merge
Simantics Platform SDK.