From: Christian Femers <femers@in.tum.de>
Date: Tue, 3 Sep 2019 06:12:38 +0000 (+0200)
Subject: Merge branch 'development' into json-fix-extended
X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=c3f6c48944beecd51a41a6e9c123b73d8b630dfb

Merge branch 'development' into json-fix-extended

Conflicts:
	net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF
	net.mograsim.machine/META-INF/MANIFEST.MF
---

c3f6c48944beecd51a41a6e9c123b73d8b630dfb
diff --cc net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF
index e063ca68,cd8ecd1e..6dfa1831
--- a/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF
+++ b/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF
@@@ -3,14 -3,11 +3,15 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Bundle-SymbolicName: net.mograsim.logic.model.am2900;singleton:=true
  Bundle-Version: 0.1.0.qualifier
 -Export-Package: net.mograsim.logic.model.am2900.components,
 +Export-Package: net.mograsim.logic.model.am2900,
 + net.mograsim.logic.model.am2900.components,
   net.mograsim.logic.model.am2900.components.am2904,
   net.mograsim.logic.model.am2900.components.am2910,
++ net.mograsim.logic.model.am2900.machine,
   net.mograsim.logic.model.examples
  Bundle-RequiredExecutionEnvironment: JavaSE-11
 -Require-Bundle: net.mograsim.machine;bundle-version="0.1.0";visibility:=reexport
 +Require-Bundle: net.mograsim.machine;bundle-version="0.1.0";visibility:=reexport,
 + org.eclipse.osgi
  Automatic-Module-Name: net.mograsim.logic.model.am2900
  Bundle-Vendor: Mograsim Team
 +Bundle-Activator: net.mograsim.logic.model.am2900.Am2900Loader
diff --cc net.mograsim.machine/META-INF/MANIFEST.MF
index 8c6df1e7,f7842aef..69361685
--- a/net.mograsim.machine/META-INF/MANIFEST.MF
+++ b/net.mograsim.machine/META-INF/MANIFEST.MF
@@@ -6,9 -6,10 +6,11 @@@ Bundle-Version: 0.1.0.qualifie
  Bundle-Vendor: Mograsim Team
  Automatic-Module-Name: net.mograsim.machine
  Bundle-RequiredExecutionEnvironment: JavaSE-11
 -Require-Bundle: net.mograsim.logic.model;bundle-version="0.1.0";visibility:=reexport,
 - net.mograsim.preferences,
 +Require-Bundle: net.mograsim.logic.core;bundle-version="0.1.0";visibility:=reexport,
 + net.mograsim.logic.model;bundle-version="0.1.0";visibility:=reexport,
-  net.mograsim.preferences;visibility:=reexport
++ net.mograsim.preferences;visibility:=reexport,
+  org.eclipse.e4.core.di.annotations,
+  org.eclipse.core.runtime
  Export-Package: net.mograsim.machine,
   net.mograsim.machine.isa,
   net.mograsim.machine.isa.types,