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

..

Browser_Tools

WIP

2019-08-27 17:02:53 +02:00

Properties

Fix SCM/CSM UI

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

Resources

Fix Maestro Acive Logo CNC

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

View

Merge branch 'integratedFileEditor' into develop

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

ACTIVE_ICONA.ico

Fix SCM/CSM UI

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

App.config

Fix Client Compile error + Managing Client General Exception Handler + Update Threads status in Server-UI

2018-02-19 11:15:39 +01:00

app.manifest

Fix SCM/CSM UI

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

Client.csproj

RollBack MetroFramework

2019-05-14 15:07:56 +02:00

Client.csproj.user

Fix Application Icons & Names

2018-10-31 17:00:46 +01:00

CMS_Client.csproj.user

- Client Configuration on XML File

2017-12-05 14:26:27 +01:00

CMS_Icon.ico

Fix Application Icons & Names

2018-10-31 17:00:46 +01:00

packages.config

RollBack MetroFramework

2019-05-14 15:07:56 +02:00

Program.cs

Fix Client stuffs

2019-04-16 16:32:25 +02:00