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/23 09:29:30 UTC

[incubator-plc4x] 13/15: Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip

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

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

commit 4021fb83f2f20b0a602230c6371dae097e1da4e5
Merge: bd550d7 0b0e202
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 23 10:55:17 2018 +0200

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip

 .../PlcUnsupportedDataTypeException.java           | 46 ++++++++++++++++++++++
 .../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 46 +++++++++++++++++++++-
 2 files changed, 90 insertions(+), 2 deletions(-)