From: Daniel Kirschten Date: Wed, 29 May 2019 19:14:08 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/development' into development X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=7b1657cb663a98cb13b762565f04c339d4069405 Merge remote-tracking branch 'origin/development' into development --- 7b1657cb663a98cb13b762565f04c339d4069405 diff --cc LogicUI/META-INF/MANIFEST.MF index 15084716,26597366..99a80966 --- a/LogicUI/META-INF/MANIFEST.MF +++ b/LogicUI/META-INF/MANIFEST.MF @@@ -4,12 -4,10 +4,14 @@@ Bundle-Name: LogicU Bundle-SymbolicName: LogicUI;singleton:=true Bundle-Version: 1.0.0 Export-Package: era.mi.gui, + era.mi.gui.components, era.mi.gui.examples, - era.mi.gui.wires -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + era.mi.gui.model, + era.mi.gui.model.components, + era.mi.gui.model.wires, - era.mi.gui.modeladapter ++ era.mi.gui.modeladapter, ++ era.mi.gui.modeladapter.componentadapters +Bundle-RequiredExecutionEnvironment: JavaSE-10 Require-Bundle: org.eclipse.swt;bundle-version="3.110.0", SWTZoomableCanvas;bundle-version="1.0.0";visibility:=reexport, era.mi;bundle-version="1.0.0";visibility:=reexport