Skip to content
Snippets Groups Projects
Commit 2f4476dd authored by Lars Erik Blümke's avatar Lars Erik Blümke
Browse files

Merge commit '862cc9eb' into lbl-sink-migration

# Conflicts:
#	src/main/java/kieker/analysis/util/AbstractBiCombinerStage.java
#	src/main/java/kieker/analysis/util/JAXBMarshalStage.java
#	src/main/java/kieker/analysis/util/graph/export/dot/DotElementExporter.java
#	src/main/java/kieker/analysis/util/graph/export/dot/DotExportConfiguration.java
#	src/main/java/kieker/analysis/util/graph/export/dot/DotFileWriterStage.java
parents 5eb8b3e0 862cc9eb
No related branches found
No related tags found
No related merge requests found
Showing
with 13542 additions and 171 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment