You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/08/13 15:08:58 UTC

[incubator-plc4x] 03/04: Merge branch 'master' of github.com:apache/incubator-plc4x into DerDackel-s7_azure_iothub_example

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch DerDackel-s7_azure_iothub_example
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit 1436e2c3f30b07c4d3f2bf68bcf3dcda636d15a4
Merge: 552385d d220353
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Aug 13 16:56:08 2018 +0200

    Merge branch 'master' of github.com:apache/incubator-plc4x into DerDackel-s7_azure_iothub_example

 src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc | 11 ++++++-----
 src/site/site.xml                                            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)