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/04/09 08:34:44 UTC

[39/50] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta

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/476dbac9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/476dbac9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/476dbac9

Branch: refs/heads/develop
Commit: 476dbac9f56b39c9b1f72308c9af8a0b930bd5fa
Parents: 8f8d19d ae3f305
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Apr 8 18:18:00 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Apr 8 18:18:00 2013 +0200

----------------------------------------------------------------------
 .../javacc/at/newmedialab/ldpath/parser/rdfpath.jj |    4 +-
 .../webservices/resource/ContentWebService.java    |   75 ++++++++++++++-
 .../core/webservices/resource/MetaWebService.java  |   10 +-
 .../webservices/resource/ResourceWebService.java   |   11 +-
 .../resource/ResourceWebServiceHelper.java         |   16 +++-
 .../src/main/resources/web/cm/ldpath.js            |    9 +-
 6 files changed, 103 insertions(+), 22 deletions(-)
----------------------------------------------------------------------