| commit | 508778956cd23335e13ad1b92905429acf04e568 | [log] [tgz] |
|---|---|---|
| author | Henrik Rentz-Reichert <hrr@protos.de> | Fri Apr 17 18:36:33 2015 +0200 |
| committer | Henrik Rentz-Reichert <hrr@protos.de> | Fri Apr 17 18:36:33 2015 +0200 |
| tree | 40d6f712628d6417b71412bbb6ae87636f70de0a | |
| parent | 282fda14fa3ac209365aeeef604899c6e941b83b [diff] | |
| parent | 609d4add5461f70f9e532d9f7e8c2d893c405bd1 [diff] |
Merge branch 'change/45854/1' Conflicts: plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend Change-Id: Ib10b40319496d576d6693020540d65d27d09291e