Marius 83a515eeee Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta ... # Conflicts: # CHANGELOG.md # FlatCAMApp.py # locale/de/LC_MESSAGES/strings.mo # locale/de/LC_MESSAGES/strings.po # locale/en/LC_MESSAGES/strings.mo # locale/en/LC_MESSAGES/strings.po # locale/es/LC_MESSAGES/strings.mo # locale/es/LC_MESSAGES/strings.po # locale/fr/LC_MESSAGES/strings.mo # locale/fr/LC_MESSAGES/strings.po # locale/hu/LC_MESSAGES/strings.mo # locale/hu/LC_MESSAGES/strings.po # locale/it/LC_MESSAGES/strings.mo # locale/it/LC_MESSAGES/strings.po # locale/pt_BR/LC_MESSAGES/strings.mo # locale/pt_BR/LC_MESSAGES/strings.po # locale/ro/LC_MESSAGES/strings.mo # locale/ro/LC_MESSAGES/strings.po # locale/ru/LC_MESSAGES/strings.po		2020-05-03 16:36:23 +03:00
..
LC_MESSAGES	Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta	2020-05-03 16:36:23 +03:00