marcos/FlatCAM

Аутор	SHA1 Порука	Датум
Marius Stanciu	b8d85d2be2 - fixed the merge methods for all FlatCAM objects	пре 5 година
David Robertson	a05c174ec8 Fix some things that I broke and further cleanup	пре 5 година
Marius Stanciu	9f13b47077 - replaced the testing if instance of FlatCAMObj with testing the obj.kind attribute	пре 5 година