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/03/25 13:19:10 UTC

[incubator-plc4x] 02/03: Merge branch 'develop' of github.com:apache/incubator-plc4x into feature/generated-drivers

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

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

commit cd5ff24acb3a7f58ba535f4dd8f5dad771eea9f9
Merge: 844fc1f 4fbfabf
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Mar 24 18:01:11 2019 +0100

    Merge branch 'develop' of github.com:apache/incubator-plc4x into feature/generated-drivers

 RELEASE_NOTES                                      |   4 +
 plc4s/pom.xml                                      |  40 ---------
 pom.xml                                            |   1 -
 src/site/asciidoc/community/getting-involved.adoc  | 100 ---------------------
 .../{community => developers}/conferences.adoc     |   2 +-
 src/site/asciidoc/developers/contributing.adoc     |   2 +
 src/site/asciidoc/developers/team.adoc             |  27 +++---
 src/site/asciidoc/index.adoc                       |  19 +++-
 src/site/resources/images/team/sruehl.jpg          | Bin 0 -> 15008 bytes
 src/site/site.xml                                  |   4 -
 10 files changed, 42 insertions(+), 157 deletions(-)