You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/02/26 16:06:24 UTC
[2/4] 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/f483bded
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f483bded
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f483bded
Branch: refs/heads/master
Commit: f483bded762b33cefa8a1cbdf2299a0bfdac5e66
Parents: e4cb722 7e4f810
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Feb 26 15:10:44 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Feb 26 15:10:44 2013 +0100
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/web.xml | 81 +++++----------
.../archetype-resources/src/main/webapp/index.jsp | 19 +---
.../src/main/webapp/WEB-INF/web.xml | 70 +++++--------
.../marmotta-webapp/src/main/webapp/index.jsp | 15 ---
.../core/webservices/resource/MetaWebService.java | 10 ++-
5 files changed, 61 insertions(+), 134 deletions(-)
----------------------------------------------------------------------