You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jm...@apache.org on 2017/12/27 04:49:00 UTC

[incubator-plc4x] 10/10: Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x

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

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

commit 3e89712b6d7936670d58a1a4259d29b7ba7c1c86
Merge: ad6bf6f 318d321
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Wed Dec 27 15:44:25 2017 +1100

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

 pom.xml                                         |   20 +-
 src/remote-resources/NOTICE                     |   26 +
 src/site/asciidoc/development/building.adoc     |   21 +
 src/site/asciidoc/development/ci.adoc           |   19 +
 src/site/asciidoc/development/contributing.adoc |   19 +
 src/site/asciidoc/development/website.adoc      |    4 +-
 src/site/site.xml                               |    6 +
 src/site/template/maven-site.vm                 | 1786 +++++++++++++++++++++++
 8 files changed, 1897 insertions(+), 4 deletions(-)

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