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

Posted to commits@plc4x.apache.org by ke...@apache.org on 2017/12/27 21:43:07 UTC

[incubator-plc4x] 03/05: Merge branch 'PLC4X-12' of https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12

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

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

commit 306e821902867861277dbbce93c6cc66e6629449
Merge: 064ebae b85290a
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Wed Dec 27 21:18:14 2017 +0100

    Merge branch 'PLC4X-12' of https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12

 .../org/apache/plc4x/scala/api/PlcDriver.scala     |   2 +-
 .../plc4x/scala/api/connection/PlcConnection.scala |   2 +-
 .../plc4x/scala/api/connection/PlcReader.scala     |   2 +-
 .../plc4x/scala/api/messages/PlcMessage.scala      |   2 +-
 .../plc4x/scala/core/JPlcConnectionWrapper.scala   |   2 +-
 .../plc4x/scala/core/JPlcDriverWrapper.scala       |   4 +-
 src/site/asciidoc/development/website.adoc         | 177 +++++++++++++++++++++
 src/site/asciidoc/infra/website.adoc               |  43 -----
 src/site/site.xml                                  |  10 +-
 9 files changed, 189 insertions(+), 55 deletions(-)

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