Merge origin/integration into MBP-109-test-pipelines-for-twincat

Conflicts:

  solution/solution.tsproj
This commit is contained in:
Federico Rojas
2019-10-15 14:19:34 +02:00

View File

@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.0">
<DataTypes>
<DataType>