diff options
| author | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
|---|---|---|
| committer | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
| commit | 12cda553738ca88662624b6f47066b5564549648 (patch) | |
| tree | bfa65b6c38aa566a5f1cc98395da6546a6c6e282 /examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/tmp/log/main_Sync.seq | |
| parent | 3447749b1a453735ac54fc09ea7680acdbb19b69 (diff) | |
| parent | d65e1d1bdd43feadb43261b85aac2d8aef5e089c (diff) | |
| download | org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.gz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.xz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Change-Id: I98e2df3ab57d6e7e8f27e5b0aee7eaa189bfbc33
Diffstat (limited to 'examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/tmp/log/main_Sync.seq')
| -rw-r--r-- | examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/tmp/log/main_Sync.seq | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/tmp/log/main_Sync.seq b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/tmp/log/main_Sync.seq index 50058ecdd..58543452e 100644 --- a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/tmp/log/main_Sync.seq +++ b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/tmp/log/main_Sync.seq @@ -1 +1 @@ -#generated MSC for Trace2UML
+#generated MSC for Trace2UML |