kieler

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
fixed conflict

Merge branch 'wah/master' of ssh://git.rtsys.informatik.uni-kiel.de:7999/KIELER/mainline into wah/master

Conflicts:

test/pom.xml

modified pom.xml

modified pom.xml

taking out blocker tests

  1. … 10 more files in changeset.
enable esterel.cec.sim.test

disable de.cau.cs.kieler.synccharts.sim.s.test

enable de.cau.cs.kieler.synccharts.sim.s.test

disable de.cau.cs.kieler.synccharts.sim.s.test

Merge branch 'wah/master' of ssh://git.rtsys.informatik.uni-kiel.de:7999/KIELER/mainline into wah/master

Yakindu

  1. … 128 more files in changeset.
enable synccharts.sim.s.test

Merge branch 'master' into wah/master

enabling de.cau.cs.kieler.esterel.cec.sim

Merge branch 'master' into wah/master

Merge branch 'master' of ssh://git.rtsys.informatik.uni-kiel.de:7999/KIELER/mainline

Merge branch 'master' of ssh://git-rtsys/kieler/mainline

kex.ui: - Removed: Export Examples wizard.

core.ui, core.product: - Changed: Moved the defintion of the modeling perspective from core.ui to core.product.

Merge branch 'master' of ssh://git-rtsys/kieler/mainline

KLay Layered: added check for minimal edge spacing

Merge branch 'master' of ssh://git.rtsys.informatik.uni-kiel.de:7999/KIELER/mainline

KLay Layered: removed unused valueof methods, organized enumerations

klighd: deactivated the closing of existing klighd views while starting up klighd, as this causes trouble in e4

kgraph.text(.ui): consolidated textual kgraph syntax a bit, re-implemented the CustomKGraphSyntacticSequencer, tuned the formatter

  1. … 24 more files in changeset.
changes from review KI-33

Merge branch 'master' of ssh://git.rtsys.informatik.uni-kiel.de:7999/KIELER/mainline

workaround for resized lifelines (create/delete) and some work on the time observation problem

enabling module de.cau.cs.kieler.sim.kiem.test

enabling test de.cau.cs.kieler.esterel.cec.sim.test