Skip to content

Commit 6c032d6

Browse files
ritchiecarrollritchiecarroll
authored
Merge branch 'master' into rm-sttp-net
2 parents d389777 + 7350583 commit 6c032d6

File tree

129 files changed

+137
-137
lines changed

Some content is hidden

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

129 files changed

+137
-137
lines changed

‎Build/Scripts/openHistorian.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.530.0
1+
2.8.533.0

‎Source/Applications/openHistorian/WixFolderGen/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("2.8.530.0")]
34-
[assembly: AssemblyVersion("2.8.530.0")]
35-
[assembly: AssemblyFileVersion("2.8.530.0")]
33+
// [assembly: AssemblyVersion("2.8.533.0")]
34+
[assembly: AssemblyVersion("2.8.533.0")]
35+
[assembly: AssemblyFileVersion("2.8.533.0")]

‎Source/Applications/openHistorian/openHistorian/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525

2626
// Assembly identity attributes.
2727

28-
[assembly: AssemblyVersion("2.8.530.0")]
29-
[assembly: AssemblyFileVersion("2.8.530.0")]
28+
[assembly: AssemblyVersion("2.8.533.0")]
29+
[assembly: AssemblyFileVersion("2.8.533.0")]

‎Source/Applications/openHistorian/openHistorianConsole/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Assembly identity attributes.
55

6-
[assembly: AssemblyVersion("2.8.530.0")]
6+
[assembly: AssemblyVersion("2.8.533.0")]
77

88
// Informational attributes.
99

‎Source/Applications/openHistorian/openHistorianSetup/BulkCalculationState.exe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:e2e89fba72c15b3988321dc9c8538f55525dfd99f5e26aed39417210a66c4bd5
2+
oid sha256:e01f5abf37191d55f2ebd25e22493173229c62ac9a886033e0ab5d7322b45f82
33
size 97752

‎Source/Applications/openHistorian/openHistorianSetup/CSVDataManager.exe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:8b60bc8a41f4ffa99dc3af7ed1227fc4dd7c57438a31407d221bf1c08b1ad4a7
2+
oid sha256:1ea58b2079a42840e42bf8662ee032123b7046fb0b25dd3654d963e88c062d1a
33
size 237528

‎Source/Applications/openHistorian/openHistorianSetup/ConfigCrypter.exe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:37581d71e663228b51c62d4e32f17389ca2f60c1b60973b235397e650714fc86
2+
oid sha256:ecf3938e578df4dde1279c70ac4044c3240d8255cf12f49a08e7f4c0fb6707bb
33
size 82904

‎Source/Applications/openHistorian/openHistorianSetup/ConfigurationEditor.exe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:987233bdd48a6315a7145ebd0a1ef8f07dab4fa5fe0799e9ff86210687b1dc23
2+
oid sha256:95200d63a80bbd41592515a4eb32941e60c9ab4b3748a769c8e8fab4444e7e81
33
size 324056

‎Source/Applications/openHistorian/openHistorianSetup/CreateOutputStream.exe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:33e55dd9aa96880cf5e275837766aeb887d6421dd6a930cebd20dab6935d826f
2+
oid sha256:3d14b1c61545454dc3dc756ed715b0ad3cf321cd35f0bf0394d279be74350b69
33
size 47576

‎Source/Applications/openHistorian/openHistorianSetup/DNP3ConfigGenerator.exe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:167e4873d684c5c0775c8a66db0bee6ffd7d68d8447dd86ce78cdd9924ab3f34
2+
oid sha256:57986cfd36022660d42507ced44f750ba4840adf43b554055d1fc5ded4c4a300
33
size 19108824

0 commit comments

Comments
 (0)