marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wik...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Date Wed, 20 Feb 2013 11:30:57 GMT
Updated Branches:
  refs/heads/master 54946f127 -> 7a1a04e75


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

Branch: refs/heads/master
Commit: 7a1a04e7515a9e1f0aa414bc924a0a9b7a57e19d
Parents: 4df8e9a 54946f1
Author: Sergio Fernández <wikier@apache.org>
Authored: Wed Feb 20 12:30:16 2013 +0100
Committer: Sergio Fernández <wikier@apache.org>
Committed: Wed Feb 20 12:30:16 2013 +0100

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/templates/rdfhtml.ftl  |    1 -
 parent/pom.xml                                     |    2 +-
 .../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, 23 insertions(+), 1038 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7a1a04e7/parent/pom.xml
----------------------------------------------------------------------


Mime
View raw message