You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/01/09 10:19:37 UTC

[1/2] git commit: Merge branch 'wicket-1.5.x' of https://git-wip-us.apache.org/repos/asf/wicket into wicket-1.5.x

Updated Branches:
  refs/heads/wicket-1.5.x 93e9186fa -> 2fd3e4612


Merge branch 'wicket-1.5.x' of https://git-wip-us.apache.org/repos/asf/wicket into wicket-1.5.x


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2fd3e461
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2fd3e461
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2fd3e461

Branch: refs/heads/wicket-1.5.x
Commit: 2fd3e46120cb365e81c722c8ea154602c97fa2ef
Parents: c54959d 93e9186
Author: martin-g <mg...@apache.org>
Authored: Mon Jan 9 11:19:31 2012 +0200
Committer: martin-g <mg...@apache.org>
Committed: Mon Jan 9 11:19:31 2012 +0200

----------------------------------------------------------------------
 .../wicket/request/mapper/HomePageMapper.java      |    4 +-
 .../wicket/request/mapper/PackageMapper.java       |   30 +++++++
 .../wicket/request/resource/AbstractResource.java  |    2 +-
 .../ajax/markup/html/modal/ModalWindow.java        |   11 +++
 .../main/java/org/apache/wicket/request/Url.java   |   61 +++++++++++++++
 .../java/org/apache/wicket/request/UrlTest.java    |   15 ++++
 6 files changed, 121 insertions(+), 2 deletions(-)
----------------------------------------------------------------------