Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-03-04 16:16:19 +0000
committerHenrik Rentz-Reichert2013-03-04 16:16:19 +0000
commit9408dcc8b8e7deb17442e8ba30768b6da51d470f (patch)
tree500732623eb1f4bbbd33ad6b1518fd1bf0b19078 /plugins/org.eclipse.etrice.core.room.ui/icons
parent91fe7f5032f5bc365ac0530d53d67567ce932174 (diff)
parent79efc110281c60098c61e62b4dfb973ba45112ab (diff)
downloadorg.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.room.ui/icons')
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/icons/LogicalThread.gifbin0 -> 1014 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/icons/actorInstanceMapping.gifbin0 -> 934 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/icons/LogicalThread.gif b/plugins/org.eclipse.etrice.core.room.ui/icons/LogicalThread.gif
new file mode 100644
index 000000000..9767cf936
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.room.ui/icons/LogicalThread.gif
Binary files differ
diff --git a/plugins/org.eclipse.etrice.core.room.ui/icons/actorInstanceMapping.gif b/plugins/org.eclipse.etrice.core.room.ui/icons/actorInstanceMapping.gif
new file mode 100644
index 000000000..c569c7131
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.room.ui/icons/actorInstanceMapping.gif
Binary files differ

Back to the top