Skip to content

Commit 3f9d0b1

Browse files
authored
Merge pull request #25 from RapidScada/develop
Merge Develop to Master
2 parents 7c00900 + 621fe41 commit 3f9d0b1

File tree

784 files changed

+38013
-5115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

784 files changed

+38013
-5115
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,7 @@ FakesAssemblies/
195195
# Visual Studio 6 workspace options file
196196
*.opt
197197

198-
*.bak
198+
*.bak
199+
200+
# Unignore the configuration database files
201+
!Base/data/*.sdf

Base/data/ScadaBase_4.1_en.sdf

308 KB
Binary file not shown.

Base/data/ScadaBase_4.1_ru.sdf

344 KB
Binary file not shown.

Base/data/ScadaBase_4.2_en.sdf

312 KB
Binary file not shown.

Base/data/ScadaBase_4.2_ru.sdf

312 KB
Binary file not shown.

Base/model/scada_3.0.erwin

56.2 KB
Binary file not shown.

Base/model/scada_4.0.erwin

56.9 KB
Binary file not shown.

Base/model/scada_4.1.erwin

300 KB
Binary file not shown.

Base/model/scada_4.1_logical.png

44.3 KB
Loading

Base/model/scada_4.1_physical.png

58.2 KB
Loading

0 commit comments

Comments
 (0)