| commit | 8fd23db96a491ad932b024664f9f6a7707b85086 | [log] [tgz] |
|---|---|---|
| author | Daniel Kunz <daniel.kunz@de.bosch.com> | Fri Oct 14 11:01:24 2016 +0200 |
| committer | Daniel Kunz <daniel.kunz@de.bosch.com> | Fri Oct 14 11:01:24 2016 +0200 |
| tree | d841a5605565e500d83905807b81d6fe3be223af | |
| parent | 70296f8e685ce71ef706128c363ea9b559425113 [diff] | |
| parent | 64676252a8aec50363480bb8a9b54d752437951e [diff] |
Merge branch 'dkunz/feature/runnable-mode' into develop Conflicts: plugins/org.eclipse.app4mc.amalthea.model.edit/xtend-gen/org/eclipse/app4mc/amalthea/model/provider/CustomItemProviderService.java