Skip to content
GitLab
Explore
Sign in
openEmbroidery
openEmbroidery_software
Commits
4af66dff
Commit
4af66dff
authored
Aug 17, 2016
by
3dsman
Browse files
Merge branch 'master' into fiilings
Conflicts: include/OE_controller.h src/OE_controller.cpp
parents
6ff95cd8
1a66c321
Changes
10
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment