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
This commit is contained in:
Marius
2020-05-03 16:36:23 +03:00
11 changed files with 38040 additions and 387 deletions

View File

@@ -162,6 +162,7 @@ class App(QtCore.QObject):
# ###############################################################################################################
# ################################### Version and VERSION DATE ##################################################
# ###############################################################################################################
version = 8.993
version_date = "2020/08/01"
beta = True