- fixed the Join function to work on Gerber and Excellon, Gerber and Gerber, Excellon and Excelon combination of objects. The merged property is the solid_geometry and the result is a FlatCAMGeometry object.

2019-01-07 01:23:04 +02:00
parent b418d15daf
commit 954bd9097a
3 changed files with 13 additions and 5 deletions
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -2044,9 +2044,10 @@ class App(QtCore.QObject):
                    "<BR>"
                    "(c) 2014-2019 <B>Juan Pablo Caram</B><BR>"
                    "<BR>"
-                    "<B>Contributors:</B><BR>"
+                    "<B> Main Contributors:</B><BR>"
                    "Denis Hayrullin<BR>"
                    "Kamil Sopko<BR>"
+                    "Marius Stanciu<BR>"
                    "Matthieu Berthomé<BR>"
                    "and many others found "
                    "<a href = \"https://bitbucket.org/jpcgt/flatcam/pull-requests/?state=MERGED\">here.</a><BR>"