Lucio Maranta b379270a09 Merge branch 'integratedFileEditor' into develop ...

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/ro.xml

2019-08-28 14:29:51 +02:00

..

LoadingForm.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

LoadingForm.Designer.cs

Fix Maestro Acive Logo CNC

2019-05-02 07:43:40 +02:00

LoadingForm.resx

Fix SCM/CSM UI

2019-04-05 12:04:27 +02:00

MainForm.cs

Revert "First Commit (not clean, only for test)"

2019-05-20 16:28:54 +02:00

MainForm.Designer.cs

Changed Client manager on Server

2019-05-17 09:33:53 +02:00

MainForm.resx

Fix SCM/CSM UI

2019-04-05 12:04:27 +02:00

NcForm.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

NcForm.Designer.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

NcForm.resx

Client Revert Commit - Solution is not working

2018-06-27 12:10:50 +02:00

NcWindow.cs

Merge branch 'integratedFileEditor' into develop

2019-08-28 14:29:51 +02:00

OpeningForm.cs

WIP file editor

2019-08-20 16:40:15 +02:00

OpeningForm.Designer.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

OpeningForm.resx

Fix SCM/CSM UI

2019-04-05 12:04:27 +02:00

ProdForm.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

ProdForm.Designer.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

ProdForm.resx

First commit

2019-03-21 17:52:55 +01:00