You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by cm...@apache.org on 2014/08/18 14:09:35 UTC

[2/3] git commit: Merge branch 'WICKET-5677' into WICKET-5265

Merge branch 'WICKET-5677' into WICKET-5265


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

Branch: refs/heads/WICKET-5265
Commit: 30a2849ed6276ac9eb91287a467a77cc0e36dc80
Parents: 9c60d34 4703c1a
Author: Carl-Eric Menzel <cm...@apache.org>
Authored: Mon Aug 18 13:35:57 2014 +0200
Committer: Carl-Eric Menzel <cm...@apache.org>
Committed: Mon Aug 18 13:35:57 2014 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/Component.java  | 430 ++++++++++---------
 .../java/org/apache/wicket/MarkupContainer.java |  48 +--
 .../test/java/org/apache/wicket/OnAddTest.java  | 160 -------
 .../java/org/apache/wicket/OnReAddTest.java     | 155 +++++++
 4 files changed, 375 insertions(+), 418 deletions(-)
----------------------------------------------------------------------