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/6526592f Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6526592f Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6526592f Branch: refs/heads/develop Commit: 6526592fd55a4964517983f20d42aebee723400b Parents: 1780f37 3f25889 Author: Sebastian Schaffert <[email protected]> Authored: Fri Mar 29 11:07:18 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Mar 29 11:07:18 2013 +0100 ---------------------------------------------------------------------- .../resources/web/admin/editor/sparql/css/font.js | 2 + .../src/main/resources/web/admin/snorql/NOTICE | 7 ++++- .../main/resources/web/admin/snorql/namespaces.js | 2 +- .../main/resources/web/admin/snorql/snorql.html | 2 +- .../src/main/resources/web/admin/snorql/snorql.js | 2 +- .../src/main/resources/web/admin/snorql/sparql.js | 19 --------------- .../src/main/resources/web/admin/snorql/style.css | 2 +- 7 files changed, 11 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
