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 /features | |
| 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 'features')
| -rw-r--r-- | features/org.eclipse.etrice.cdt-integration.feature/feature.xml | 2 | ||||
| -rw-r--r-- | features/org.eclipse.etrice.feature/feature.xml | 2 | ||||
| -rw-r--r-- | features/org.eclipse.etrice.fsm.feature/feature.xml | 2 | ||||
| -rw-r--r-- | features/org.eclipse.etrice.tests.feature/feature.xml | 2 | ||||
| -rw-r--r-- | features/pom.xml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml index 97c277b16..5777cf74d 100644 --- a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml +++ b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml @@ -17,7 +17,7 @@ <feature id="org.eclipse.etrice.cdt-integration.feature" label="%featureName" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="%providerName" plugin="org.eclipse.etrice.core.room.ui" license-feature="org.eclipse.license" diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml index 38f929ce9..c11eb38b3 100644 --- a/features/org.eclipse.etrice.feature/feature.xml +++ b/features/org.eclipse.etrice.feature/feature.xml @@ -17,7 +17,7 @@ <feature id="org.eclipse.etrice.feature" label="%featureName" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="%providerName" plugin="org.eclipse.etrice.core.room.ui" license-feature="org.eclipse.license" diff --git a/features/org.eclipse.etrice.fsm.feature/feature.xml b/features/org.eclipse.etrice.fsm.feature/feature.xml index 5c2da09f0..014d1be03 100644 --- a/features/org.eclipse.etrice.fsm.feature/feature.xml +++ b/features/org.eclipse.etrice.fsm.feature/feature.xml @@ -17,7 +17,7 @@ <feature id="org.eclipse.etrice.fsm.feature" label="eTrice.FSM Feature" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="eTrice" license-feature="org.eclipse.license" license-feature-version="1.0.1.v20140414-1359"> diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml index 70946640b..0aec1ef90 100644 --- a/features/org.eclipse.etrice.tests.feature/feature.xml +++ b/features/org.eclipse.etrice.tests.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.etrice.tests.feature" label="%featureName" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="%providerName"> <description> diff --git a/features/pom.xml b/features/pom.xml index 01951fa06..49b8e7b74 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <relativePath>../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> |