Merge branch 'control-inheritance' of https://github.com/marcjansen/openlayers into control-inheritance

Conflicts:
	tests/Control/ZoomOut.html
	tests/Control/ZoomToMaxExtent.html
This commit is contained in:
Marc Jansen
2012-06-08 09:44:36 +02:00
6 changed files with 332 additions and 41 deletions

View File

@@ -25,7 +25,7 @@ function test_ZoomToMaxExtent_constructor (t) {
control.destroy();
}
function test_ZoomOut_type(t){
function test_ZoomToMaxExtent_type (t) {
t.plan( 1 );
// setup