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


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

Branch: refs/heads/wicket-7.x
Commit: 37a961b7f6f6ae571b4e4330d008d1ecdd8ea6db
Parents: 190cf3f b3c813c
Author: Martijn Dashorst <[email protected]>
Authored: Thu May 5 12:11:47 2016 +0200
Committer: Martijn Dashorst <[email protected]>
Committed: Thu May 5 12:11:47 2016 +0200

----------------------------------------------------------------------
 .../markup/html/media/MediaComponent.java       | 69 ++++++++++++++++++++
 .../extensions/yui/calendar/DateTimeField.java  | 13 ++--
 .../org/apache/wicket/examples/media/Home.css   |  4 +-
 .../org/apache/wicket/examples/media/Home.html  |  2 +-
 .../org/apache/wicket/examples/media/Home.java  | 39 +++++------
 .../markup/html/form/palette/Palette.java       | 13 ++--
 6 files changed, 106 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


Reply via email to