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:49 UTC

[plc4x] 02/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 f7771ccdb538dd6436ccb5b17b688cf6ade148c8
Merge: f93faa0 8c9e36a
Author: v.emmert <v....@pragmaticminds.de>
AuthorDate: Tue Jul 30 11:54:19 2019 +0200

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

 .../language/java/JavaLanguageTemplateHelper.java  | 30 ++++++++++++++--------
 .../main/resources/templates/java/io-template.ftlh |  2 +-
 .../plugins/codegenerator/language/mspec/MSpec.g4  |  4 +--
 pom.xml                                            | 14 ++++++++++
 4 files changed, 36 insertions(+), 14 deletions(-)