Skip to content
Snippets Groups Projects
Commit 8342f481 authored by Andrey Ruzhanskiy's avatar Andrey Ruzhanskiy
Browse files

Merge branch 'master' into feat/line_rasterizer-31 

 Conflicts:
	src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LegendRasterizer.java
	src/main/java/de/tudresden/inf/mci/brailleplot/rendering/language/BrailleLanguage.java
	src/main/java/de/tudresden/inf/mci/brailleplot/rendering/language/package-info.java
parents 3d0f7fe9 c7f6e264
No related branches found
No related tags found
1 merge request!40feat/line rasterizer 31
Hide whitespace changes
Inline Side-by-side
Showing
with 95 additions and 29 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung