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/04/18 13:17:41 UTC

[incubator-plc4x] 01/02: Merge branches 'develop' and 'feature/graduation-adjustments' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/graduation-adjustments

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

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

commit 783a7bc4f0ecdb8eddb9918bbccf6cb12cfa2395
Merge: 3fa9bee 3755211
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Apr 18 15:13:15 2019 +0200

    Merge branches 'develop' and 'feature/graduation-adjustments' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/graduation-adjustments

 .gitignore                                    |  7 ++++++-
 integrations/apache-kafka/README.md           |  7 ++++++-
 plc4cpp/README.md                             | 10 +++++++++-
 src/site/asciidoc/developers/conferences.adoc |  1 +
 src/site/asciidoc/index.adoc                  |  3 +--
 5 files changed, 23 insertions(+), 5 deletions(-)