Marius Stanciu b8d85d2be2 - fixed the merge methods for all FlatCAM objects

2020-04-29 11:10:43 +03:00

..

__init__.py

…

FlatCAMCNCJob.py

Merge branch 'Beta' of https://bitbucket.org/jpcgt/flatcam into extract-prefs-code-from-app-class

2020-04-29 02:57:17 +01:00

FlatCAMDocument.py

…

FlatCAMExcellon.py

- fixed the merge methods for all FlatCAM objects

2020-04-29 11:10:43 +03:00

FlatCAMGeometry.py

- fixed the merge methods for all FlatCAM objects

2020-04-29 11:10:43 +03:00

FlatCAMGerber.py

- fixed the merge methods for all FlatCAM objects

2020-04-29 11:10:43 +03:00

FlatCAMObj.py

Fix some things that I broke and further cleanup

2020-04-29 02:46:52 +01:00

FlatCAMScript.py

- some minor changes in the Python version detection

2020-04-28 14:37:34 +03:00

ObjectCollection.py

Merge branch 'Beta' of https://bitbucket.org/jpcgt/flatcam into extract-prefs-code-from-app-class

2020-04-29 02:57:17 +01:00