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

Merge branch 'master' into feat/brailletextrasterizer-38 

 Conflicts:
	src/main/java/de/tudresden/inf/mci/brailleplot/App.java
	src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleTextRasterizer.java
parents aa8f97d3 fa47534b
No related branches found
No related tags found
1 merge request!24Feat/brailletextrasterizer 38
Hide whitespace changes
Inline Side-by-side
Showing
with 1269 additions and 110 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