You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/03/08 10:22:25 UTC
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Updated Branches:
refs/heads/master 39afa1f8a -> 757161830
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/75716183
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/75716183
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/75716183
Branch: refs/heads/master
Commit: 757161830272d304109e5f1f7e2425db9bdaddf4
Parents: 0cedfc3 39afa1f
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Mar 8 10:21:43 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Mar 8 10:21:43 2013 +0100
----------------------------------------------------------------------
README.mysql | 24 ++++++
.../src/main/resources/archetype-resources/pom.xml | 3 +
build/dependency-resource-supplement/pom.xml | 29 +++++++
.../src/main/resources/supplemental-models.xml | 58 +++++++++++++++
build/pom.xml | 1 +
launchers/marmotta-webapp/pom.xml | 4 -
libraries/kiwi/kiwi-reasoner/pom.xml | 1 +
libraries/kiwi/kiwi-transactions/pom.xml | 1 +
libraries/kiwi/kiwi-triplestore/pom.xml | 1 +
libraries/kiwi/kiwi-versioning/pom.xml | 1 +
libraries/kiwi/pom.xml | 5 -
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 1 +
libraries/ldcache/ldcache-core/pom.xml | 1 +
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 1 +
parent/pom.xml | 23 ++++--
15 files changed, 137 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/75716183/parent/pom.xml
----------------------------------------------------------------------