Merge remote-tracking branch 'upstream/master' into trunk
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9a2f8c86 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9a2f8c86 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9a2f8c86 Branch: refs/heads/master Commit: 9a2f8c8665c48abe29611cc5d5f0cc72e53c961c Parents: 5521138 bade762 Author: Michael Mosmann <[email protected]> Authored: Mon Oct 1 00:58:04 2012 +0200 Committer: Michael Mosmann <[email protected]> Committed: Mon Oct 1 00:58:04 2012 +0200 ---------------------------------------------------------------------- .../src/main/resources/archetype-resources/pom.xml | 2 +- release-dashorst.sh | 4 ++ .../AjaxFormChoiceComponentUpdatingBehavior.java | 39 ++++++++++---- .../wicket/markup/head/CssReferenceHeaderItem.java | 2 +- .../markup/head/CssUrlReferenceHeaderItem.java | 2 +- .../markup/head/JavaScriptReferenceHeaderItem.java | 5 +- .../head/JavaScriptUrlReferenceHeaderItem.java | 5 +- .../head/filter/AbstractHeaderResponseFilter.java | 10 ++++ .../filter/CssAcceptingHeaderResponseFilter.java | 2 +- .../CssAndPageAcceptingHeaderResponseFilter.java | 2 +- .../JavaScriptAcceptingHeaderResponseFilter.java | 2 +- wicket-examples/pom.xml | 2 +- wicket-experimental/pom.xml | 8 ++-- .../wicket-examples-jar/pom.xml | 2 +- .../wicket-native-websocket/pom.xml | 2 +- 15 files changed, 61 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
