You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/06/07 17:33:38 UTC

[33/37] git commit: Merge branch 'prepare/isis-simple-1.5.0-RC2' into prepare/isis-1.5.0-RC1

Merge branch 'prepare/isis-simple-1.5.0-RC2' into prepare/isis-1.5.0-RC1


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8797968e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8797968e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8797968e

Branch: refs/heads/master
Commit: 8797968e41d022e9f593d3a4b5301be24a0fe740
Parents: 9c96290 887396b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jun 7 08:14:07 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jun 7 08:14:07 2014 +0200

----------------------------------------------------------------------
 .../simple_wicket_restful_jdo/webapp/pom.xml            | 12 +++++++++---
 .../webapp/src/main/webapp/WEB-INF/isis.properties      |  3 +++
 .../main/resources/archetype-resources/webapp/pom.xml   | 12 +++++++++---
 .../webapp/src/main/webapp/WEB-INF/isis.properties      |  3 +++
 4 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------