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

[plc4x] 05/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 f5a514e6929930c16afd8ae48abdb695cb693683
Merge: 17dc04f 6ffc170
Author: v.emmert <v....@pragmaticminds.de>
AuthorDate: Tue Jul 30 16:18:08 2019 +0200

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

 .../org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)