Skip to content
Commit 370e0cf4 authored by 3dsman's avatar 3dsman
Browse files

Merge branch 'fiilings' of... 

Merge branch 'fiilings' of git@code.electrolab.fr:openEmbroidery/openEmbroidery_software.git into fiilings

# Conflicts:
#	include/OE_display.h
#	src/OE_interfaceDisplay.cpp
parents 4f53ebdb 78959e69
Hide whitespace changes
Inline Side-by-side
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