diff options
| author | Juergen Haug | 2018-06-18 08:25:01 +0000 |
|---|---|---|
| committer | Juergen Haug | 2018-06-18 08:25:01 +0000 |
| commit | 842d1ee0c1cb95148ba3815cc66024317e37eb2e (patch) | |
| tree | e7ee889793d4cf5ec16419fbdc8a73889154361a /plugins/org.eclipse.etrice.core.genmodel.fsm | |
| parent | 29873f1151bb915cf3044f21deca9c756d3f95e0 (diff) | |
| parent | 3a0767800bb81a9f3f1f84024cfc3fcd5769df3f (diff) | |
| download | org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.gz org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.xz org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.zip | |
Merge remote-tracking branch 'gerrit/master' into newfsmgen_finalize
Conflicts:
plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
pom.xml
releng/org.eclipse.etrice.parent/pom.xml
tests/org.eclipse.etrice.generator.c.tests/.gitignore
tests/org.eclipse.etrice.generator.cpp.tests/.gitignore
tests/org.eclipse.etrice.generator.java.tests/.gitignore
Change-Id: I048e62574a0bca94bf86ed19bba6ed4325a37e81
Diffstat (limited to 'plugins/org.eclipse.etrice.core.genmodel.fsm')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF index 4dc77f836..a0a0b2e1c 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.fsm;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.genmodel.fsm, @@ -10,7 +10,7 @@ Export-Package: org.eclipse.etrice.core.genmodel.fsm, org.eclipse.etrice.core.genmodel.fsm.fsmgen.impl, org.eclipse.etrice.core.genmodel.fsm.fsmgen.util Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport, - org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport, + org.eclipse.etrice.core.fsm;bundle-version="1.1.2";visibility:=reexport, org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, |