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 2019/08/07 08:47:55 UTC

[plc4x] 08/17: Merge branch 'develop' of https://github.com/apache/plc4x into implement-df1-protocol

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

cdutz pushed a commit to branch feature/implement-df1-driver
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 3c570d2034d5657b293a8d8e09e9c24510b3f124
Merge: 2524123 4cc954c
Author: v.emmert <v....@pragmaticminds.de>
AuthorDate: Tue Jul 30 16:35:08 2019 +0200

    Merge branch 'develop' of https://github.com/apache/plc4x into implement-df1-protocol

 .../src/main/resources/templates/java/io-template.ftlh             | 7 ++++++-
 .../src/main/java/org/apache/plc4x/java/utils/MessageIO.java       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)