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 2017/08/06 11:51:39 UTC
[4/4] wicket git commit: Merge branch 'pr-228-WICKET-6437'
Merge branch 'pr-228-WICKET-6437'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/549ff630
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/549ff630
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/549ff630
Branch: refs/heads/master
Commit: 549ff6300985eab44dea59a3a6120e78632ebe6c
Parents: 4a72c99 180fad1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Aug 6 14:51:24 2017 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Aug 6 14:51:24 2017 +0300
----------------------------------------------------------------------
pom.xml | 24 ++++++++++----------
testing/wicket-arquillian/pom.xml | 4 ++--
.../wicket/model/CompoundPropertyModel.java | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/549ff630/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
index 74bf429,6146529..6f821d8
--- a/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java
@@@ -157,10 -157,10 +157,10 @@@ public class CompoundPropertyModel<T> e
{
return new CompoundPropertyModel<>(model);
}
-
+
/**
* Type-infering factory method
- *
+ *
* @param <Z>
* the type of the model's object
* @param object