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

Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/01/05 10:34:20 UTC

[incubator-plc4x] 01/02: Merge branch 'master' into refactoring/java_generify

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

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

commit d7730f07f80177e84c0cd7a88645bb586970f178
Merge: 71fecb8 b3d4564
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jan 4 17:42:41 2018 +0100

    Merge branch 'master' into refactoring/java_generify
    
    # Conflicts:
    #	plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java

 .../org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.