Menu
▾
▴
SourceCode Merge Request #7: DXF loader stability fixes (merged)
Merging...
Merged
Something went wrong. Please, merge manually
Checking if merge is possible...
Something went wrong. Please, merge manually
Andrey Zabolotnyi wants to merge 4 commits from /u/andyz/dxf2gcode/ to develop, 2019-04-26
This file fixes a couple of exceptions I've got while trying to import some of my DXF files.
| Commit | Date | |
|---|---|---|
|
[b81df7]
(upstream-dxfload)
by
Andrey Zabolotnyi
Merge branch 'upstream-dxfload' of ssh://git.code.sf.net/u/andyz/dxf2gcode into upstream-dxfload |
2019-04-23 21:33:58 | Tree |
| 2019-04-21 14:37:27 | Tree | |
|
[3c1393]
by
Andrey Zabolotnyi
Resolved conflict in Russian translation after merging develop with other translation patch |
2019-04-23 06:00:08 | Tree |
| 2019-04-21 14:37:27 | Tree |
Hello Andrey, this merge has conflicts. I propose to give you developer rights, then you can merge this. I think your the best one to do it :-) ...
Please give me feedback if thats ok for you
Regards Christian
Hello Christian, it would be great although I'm not a expert in CNC area.
But I can help with smoothing rough edges, usability and GUI and things like that.
I've fixed the tree, now you can merge it...