diff options
| author | Henrik Rentz-Reichert | 2013-03-04 16:16:19 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2013-03-04 16:16:19 +0000 |
| commit | 9408dcc8b8e7deb17442e8ba30768b6da51d470f (patch) | |
| tree | 500732623eb1f4bbbd33ad6b1518fd1bf0b19078 /plugins/org.eclipse.etrice.core.config.ui | |
| parent | 91fe7f5032f5bc365ac0530d53d67567ce932174 (diff) | |
| parent | 79efc110281c60098c61e62b4dfb973ba45112ab (diff) | |
| download | org.eclipse.etrice-9408dcc8b8e7deb17442e8ba30768b6da51d470f.tar.gz org.eclipse.etrice-9408dcc8b8e7deb17442e8ba30768b6da51d470f.tar.xz org.eclipse.etrice-9408dcc8b8e7deb17442e8ba30768b6da51d470f.zip | |
Merge branch 'change/10794/1'
Conflicts:
plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/AbstractExecutionValidator.java
plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ActiveRules.java
plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ProposalGenerator.java
plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ReachabilityCheck.java
plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/SemanticsCheck.java
Diffstat (limited to 'plugins/org.eclipse.etrice.core.config.ui')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.config.ui/icons/config_icon.gif | bin | 0 -> 932 bytes | |||
| -rw-r--r-- | plugins/org.eclipse.etrice.core.config.ui/plugin.xml | 13 |
2 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.core.config.ui/icons/config_icon.gif b/plugins/org.eclipse.etrice.core.config.ui/icons/config_icon.gif Binary files differnew file mode 100644 index 000000000..3bed48022 --- /dev/null +++ b/plugins/org.eclipse.etrice.core.config.ui/icons/config_icon.gif diff --git a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml index 4fc2efaec..b4320fd34 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml +++ b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml @@ -6,12 +6,13 @@ <extension
point="org.eclipse.ui.editors">
<editor
- class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
- contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
- default="true"
- extensions="config"
- id="org.eclipse.etrice.core.Config"
- name="Config Editor">
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+ contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+ default="true"
+ extensions="config"
+ icon="icons/config_icon.gif"
+ id="org.eclipse.etrice.core.Config"
+ name="Config Editor">
</editor>
</extension>
<extension
|
