Skip to content
Snippets Groups Projects
Commit e043535d authored by Georg Graßnick's avatar Georg Graßnick :thinking:
Browse files

Merge branch 'master' into feat/libluis_bin 

 Conflicts:
	src/main/java/de/tudresden/inf/mci/brailleplot/App.java
	src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LiblouisBrailleTextRasterizer.java
parents 502b488e a8c8e3ac
No related branches found
No related tags found
1 merge request!35Feat/libluis bin
Hide whitespace changes
Inline Side-by-side
Showing
with 452 additions and 130 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