diff options
| author | Henrik Rentz-Reichert | 2013-11-25 15:26:10 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2013-11-25 15:26:10 +0000 |
| commit | 3641f9620fd07822e07c05676c0f9e1e375a8b07 (patch) | |
| tree | e0c3c4396eb5bd197887243ad5a639718875653f /examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/demomodel/start/trafficlight.etphys | |
| parent | 53c33e15786cb41839455689d0086d7320099b5b (diff) | |
| parent | d9871bb6cfbd3b146f6c0da07136192291bedd24 (diff) | |
| download | org.eclipse.etrice-3641f9620fd07822e07c05676c0f9e1e375a8b07.tar.gz org.eclipse.etrice-3641f9620fd07822e07c05676c0f9e1e375a8b07.tar.xz org.eclipse.etrice-3641f9620fd07822e07c05676c0f9e1e375a8b07.zip | |
Merge branch 'change/18572/5'
Conflicts:
plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Initialization.xtend
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java
plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/CppExtensions.xtend
plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ILanguageExtension.java
Diffstat (limited to 'examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/demomodel/start/trafficlight.etphys')
| -rw-r--r-- | examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/demomodel/start/trafficlight.etphys | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/demomodel/start/trafficlight.etphys b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/demomodel/start/trafficlight.etphys index f8e844836..d08e35e2e 100644 --- a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/demomodel/start/trafficlight.etphys +++ b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/demomodel/start/trafficlight.etphys @@ -1,6 +1,6 @@ -PhysicalModel TrafficLightPhysicalModel {
+PhysicalModel TrafficLightPhysicalModel { - PhysicalSystem PhysicalSys {
+ PhysicalSystem PhysicalSys { NodeRef node1 : NodeClass1 } |