marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Date Fri, 15 Mar 2013 09:25:18 GMT
Updated Branches:
  refs/heads/master 289e31e6d -> 358a9fbe4


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

Branch: refs/heads/master
Commit: 358a9fbe46a4e947d924396a8ca3ca0851c9773a
Parents: 0d292cc 289e31e
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Fri Mar 15 10:23:58 2013 +0100
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Fri Mar 15 10:23:58 2013 +0100

----------------------------------------------------------------------
 .../platform/core/rio/RDFHtmlWriterImpl.java       |   11 ++-
 .../services/templating/TemplatingServiceImpl.java |    2 +-
 .../webservices/resource/ContentWebService.java    |   52 ++++++++-------
 .../core/webservices/resource/MetaWebService.java  |   14 ++--
 .../webservices/resource/ResourceWebService.java   |    2 +-
 .../resource/ResourceWebServiceHelper.java         |   13 +++-
 .../webservices/triplestore/ContextWebService.java |    2 +-
 .../src/main/resources/templates/404.ftl           |   23 ++++---
 .../src/main/resources/templates/rdfhtml.ftl       |   43 ++++++------
 .../resources/web/public/style/scheme/dark.css     |    7 +-
 10 files changed, 94 insertions(+), 75 deletions(-)
----------------------------------------------------------------------



Mime
View raw message