You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/02/20 16:14:22 UTC
[5/5] git commit: Merge remote-tracking branch 'origin/master'
Updated Branches:
refs/heads/master 7a1a04e75 -> e0aa25672
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/e0aa2567
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/e0aa2567
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/e0aa2567
Branch: refs/heads/master
Commit: e0aa2567276297c740ff3f27602e906c62a50ced
Parents: 769e82a 7a1a04e
Author: Jakob Frank <ja...@apache.org>
Authored: Wed Feb 20 16:13:28 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Wed Feb 20 16:13:28 2013 +0100
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/templates/rdfhtml.ftl | 1 -
parent/pom.xml | 7 +-
.../src/main/resources/config-defaults.properties | 4 +-
.../main/resources/config-descriptions.properties | 2 +-
.../src/main/resources/web/admin/about.html | 79 +--
.../main/resources/web/admin/configuration.html | 4 +-
.../src/main/resources/web/admin/contexts.html | 4 +-
.../src/main/resources/web/admin/database.html | 2 +-
.../src/main/resources/web/admin/export.html | 2 -
.../src/main/resources/web/admin/first_steps.html | 171 +-----
.../src/main/resources/web/admin/prefixes.html | 2 +-
.../src/main/resources/web/admin/system.html | 4 +-
.../src/main/resources/web/admin/tasks.html | 2 +-
.../resources/web/public/img/logo/lmf-logo.png | Bin 368697 -> 0 bytes
.../web/public/js/widgets/property_config.js | 215 ------
.../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 0 bytes
.../images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 0 bytes
.../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 0 bytes
.../images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 0 bytes
.../images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 0 bytes
.../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 0 bytes
.../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 0 bytes
.../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 0 bytes
.../smoothness/images/ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes
.../smoothness/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
.../smoothness/images/ui-icons_454545_256x240.png | Bin 4369 -> 0 bytes
.../smoothness/images/ui-icons_888888_256x240.png | Bin 4369 -> 0 bytes
.../smoothness/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 0 bytes
.../style/smoothness/jquery-ui-1.8.21.custom.css | 565 ---------------
.../src/main/resources/web/admin/rules.html | 2 -
30 files changed, 28 insertions(+), 1038 deletions(-)
----------------------------------------------------------------------