Marius Stanciu b8d85d2be2 - fixed the merge methods for all FlatCAM objects %!s(int64=5) %!d(string=hai) anos
..
FlatCAMCNCJob.py db37714025 Merge branch 'Beta' of https://bitbucket.org/jpcgt/flatcam into extract-prefs-code-from-app-class %!s(int64=5) %!d(string=hai) anos
FlatCAMDocument.py 9f13b47077 - replaced the testing if instance of FlatCAMObj with testing the obj.kind attribute %!s(int64=5) %!d(string=hai) anos
FlatCAMExcellon.py b8d85d2be2 - fixed the merge methods for all FlatCAM objects %!s(int64=5) %!d(string=hai) anos
FlatCAMGeometry.py b8d85d2be2 - fixed the merge methods for all FlatCAM objects %!s(int64=5) %!d(string=hai) anos
FlatCAMGerber.py b8d85d2be2 - fixed the merge methods for all FlatCAM objects %!s(int64=5) %!d(string=hai) anos
FlatCAMObj.py a05c174ec8 Fix some things that I broke and further cleanup %!s(int64=5) %!d(string=hai) anos
FlatCAMScript.py eed7e3d620 - some minor changes in the Python version detection %!s(int64=5) %!d(string=hai) anos
ObjectCollection.py db37714025 Merge branch 'Beta' of https://bitbucket.org/jpcgt/flatcam into extract-prefs-code-from-app-class %!s(int64=5) %!d(string=hai) anos
__init__.py 9f13b47077 - replaced the testing if instance of FlatCAMObj with testing the obj.kind attribute %!s(int64=5) %!d(string=hai) anos