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 Mon, 18 Mar 2013 12:42:17 GMT
Updated Branches:
  refs/heads/master 51575c68d -> e0045ea0d


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

Branch: refs/heads/master
Commit: e0045ea0d718d1d8817f798bc996798b187ed936
Parents: ed4e3c3 51575c6
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Mon Mar 18 13:42:00 2013 +0100
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Mon Mar 18 13:42:00 2013 +0100

----------------------------------------------------------------------
 .../model/functions/text/StrJoinFunction.java      |    2 +-
 .../webservices/triplestore/ContextWebService.java |    4 +-
 .../src/main/resources/templates/404.ftl           |   69 ++++++---------
 .../src/main/resources/templates/admin.ftl         |    8 +-
 .../src/main/resources/web/public/style/404.css    |   44 +++++++++
 .../main/resources/web/public/style/rdfhtml.css    |    1 +
 .../resources/web/public/style/scheme/dark.css     |   23 ++++-
 .../src/main/resources/web/public/style/style.css  |    5 +-
 8 files changed, 99 insertions(+), 57 deletions(-)
----------------------------------------------------------------------



Mime
View raw message