db765cb26e40bae06c60ab20ffebaf4ce80f16d2 - mdmbl/org.eclipse.mdm.api.base

commit: db765cb26e40bae06c60ab20ffebaf4ce80f16d2
[log] [tgz]
author: Matthias Koller <m.koller@peak-solution.de>
Fri Nov 08 12:41:05 2019 +0100
committer: Matthias Koller <m.koller@peak-solution.de>
Fri Nov 08 12:41:05 2019 +0100
tree: 3d3266c242d8345974edbeba1cbc3586474e67b4
parent: e6db0405afaf81ed70c429469f99381ae974d4a3 [diff]
parent: 6570925a091ea9c7ec5707a13f0a2435795b47ec [diff]

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle

Signed-off-by: Matthias Koller <m.koller@peak-solution.de>

tree: 3d3266c242d8345974edbeba1cbc3586474e67b4