Merge pull request #96 from RapidScada/develop

Merge develop to master
RapidScada · Jan 28, 2020 · 2ee893a · 2ee893a
2 parents 19f486c + e1c5f3f
commit 2ee893a
Show file tree

Hide file tree

Showing 155 changed files with 5,765 additions and 1,572 deletions.
diff --git a/Base/model/scada_6.0.png b/Base/model/scada_6.0.png
diff --git a/Base/model/scada_6.0.xml b/Base/model/scada_6.0.xml
diff --git a/Config/DefaultEn/Images/server_room.png b/Config/DefaultEn/Images/server_room.png
diff --git a/Config/DefaultEn/Images/server_room.psd b/Config/DefaultEn/Images/server_room.psd
diff --git a/Config/DefaultEn/SCADA/Interface/DemoViews/Notifications.tbl b/Config/DefaultEn/SCADA/Interface/DemoViews/Notifications.tbl
diff --git a/Config/DefaultEn/SCADA/Interface/DemoViews/OpcDemo.tbl b/Config/DefaultEn/SCADA/Interface/DemoViews/OpcDemo.tbl
diff --git a/Config/DefaultEn/SCADA/Interface/DemoViews/SnmpDemo.tbl b/Config/DefaultEn/SCADA/Interface/DemoViews/SnmpDemo.tbl
diff --git a/Config/DefaultEn/SCADA/Interface/Servers/ServerRoom.sch b/Config/DefaultEn/SCADA/Interface/Servers/ServerRoom.sch
diff --git a/Config/DefaultEn/SCADA/Interface/Servers/ServerRoom.tbl b/Config/DefaultEn/SCADA/Interface/Servers/ServerRoom.tbl
diff --git a/Config/DefaultEn/SCADA/ScadaComm/Config/AddressBook.xml b/Config/DefaultEn/SCADA/ScadaComm/Config/AddressBook.xml
diff --git a/Config/DefaultEn/SCADA/ScadaComm/Config/KpEmail_041.xml b/Config/DefaultEn/SCADA/ScadaComm/Config/KpEmail_041.xml
diff --git a/Config/DefaultEn/SCADA/ScadaComm/Config/KpModbus_Adam6015.xml b/Config/DefaultEn/SCADA/ScadaComm/Config/KpModbus_Adam6015.xml
diff --git a/Config/DefaultEn/SCADA/ScadaComm/Config/KpSnmp_051.xml b/Config/DefaultEn/SCADA/ScadaComm/Config/KpSnmp_051.xml
diff --git a/Config/DefaultEn/SCADA/ScadaComm/Config/ScadaCommSvcConfig.xml b/Config/DefaultEn/SCADA/ScadaComm/Config/ScadaCommSvcConfig.xml
diff --git a/Config/DefaultMono/SCADA/ScadaComm/Config/ScadaCommSvcConfig.xml b/Config/DefaultMono/SCADA/ScadaComm/Config/ScadaCommSvcConfig.xml
diff --git a/Config/DefaultMono/SCADA/scadarestart.sh b/Config/DefaultMono/SCADA/scadarestart.sh
diff --git a/Config/DefaultMono/SCADA/scadastart.sh b/Config/DefaultMono/SCADA/scadastart.sh