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 2015/03/12 09:16:35 UTC
[2/5] wicket git commit: Merge remote-tracking branch
'upstream/wicket-6.x' into wicket-6.x
Merge remote-tracking branch 'upstream/wicket-6.x' into wicket-6.x
Conflicts:
wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/830776e9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/830776e9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/830776e9
Branch: refs/heads/wicket-6.x
Commit: 830776e90ffd564d7b8e678c8d850d18a41e5142
Parents: e00c54c eafffd7
Author: Alexander Morozov <al...@gmail.com>
Authored: Fri Mar 6 23:07:16 2015 +0600
Committer: Alexander Morozov <al...@gmail.com>
Committed: Fri Mar 6 23:07:16 2015 +0600
----------------------------------------------------------------------
.../wicket/proxy/LazyInitProxyFactory.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------