You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2013/06/27 15:37:38 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/wicket-6.x'
into wicket-6.x
Merge remote-tracking branch 'origin/wicket-6.x' into wicket-6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ffd155a1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ffd155a1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ffd155a1
Branch: refs/heads/wicket-6.x
Commit: ffd155a13f2877ff4374c9b2d9fb31f300c07655
Parents: 2b70152 f040afa
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Jun 27 15:37:26 2013 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Jun 27 15:37:26 2013 +0200
----------------------------------------------------------------------
.../wicket/ajax/AbstractAjaxResponse.java | 2 +-
.../ajax/IAjaxRegionMarkupIdProvider.java | 12 ++++++------
.../wicket/markup/head/OnEventHeaderItem.java | 19 +++++++++++++++++--
.../resource/ResourceStreamRequestHandler.java | 20 ++++++++++++++++----
.../resource/PackageResourceReference.java | 9 ++++++++-
.../resource/PackageResourceReferenceTest.java | 20 ++++++++++++++++++++
6 files changed, 68 insertions(+), 14 deletions(-)
----------------------------------------------------------------------