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 2020/06/06 13:11:13 UTC

[plc4x] 01/01: Merge branches 'develop' and 'feature/c-code-generation' of https://gitbox.apache.org/repos/asf/plc4x into feature/c-code-generation

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

cdutz pushed a commit to branch feature/c-code-generation
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit c4648b944cd4184dbd4ae808d1141b7a90bd3496
Merge: 8799494 f2490d3
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sat Jun 6 15:10:51 2020 +0200

    Merge branches 'develop' and 'feature/c-code-generation' of https://gitbox.apache.org/repos/asf/plc4x into feature/c-code-generation

 media/powered-by-plc4x.png                         | Bin 0 -> 99195 bytes
 media/toddy-loves-apache.png                       | Bin 0 -> 265483 bytes
 plc4j/drivers/opcua/pom.xml                        |   8 ++--
 .../asciidoc/users/{users.adoc => adopters.adoc}   |  30 ++++++------
 src/site/asciidoc/users/commercial-support.adoc    |  51 +++++++++++++++++++++
 src/site/resources/images/toddy-loves-apache.png   | Bin 0 -> 265483 bytes
 src/site/site.xml                                  |   1 +
 7 files changed, 73 insertions(+), 17 deletions(-)