Merge branch 'trunk', 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/0eb9e93c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0eb9e93c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0eb9e93c Branch: refs/heads/master Commit: 0eb9e93c1e2e6ff0f0624be6b7296dcf9ad2ca6c Parents: a09e057 6260635 Author: Michael Mosmann <[email protected]> Authored: Tue Nov 13 12:55:34 2012 +0100 Committer: Michael Mosmann <[email protected]> Committed: Tue Nov 13 12:55:34 2012 +0100 ---------------------------------------------------------------------- .../markup/html/SecurePackageResourceGuard.java | 1 + .../core/util/license/ApacheLicenceHeaderTest.java | 4 +- wicket-core/src/test/js/all.html | 4 +- wicket-core/src/test/js/qunit/qunit-1.10.0.css | 235 ++ wicket-core/src/test/js/qunit/qunit-1.10.0.js | 1977 +++++++++++++++ wicket-core/src/test/js/qunit/qunit-1.9.0.css | 231 -- wicket-core/src/test/js/qunit/qunit-1.9.0.js | 1932 -------------- .../html/repeater/data/table/AbstractToolbar.java | 5 +- 8 files changed, 2220 insertions(+), 2169 deletions(-) ----------------------------------------------------------------------
