Merge branch 'master' into tile-fade-in

Conflicts:
	examples/fullScreen.js
This commit is contained in:
Éric Lemoine
2012-01-05 09:39:39 +01:00
251 changed files with 307 additions and 275 deletions

View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for
* full list of contributors). Published under the Clear BSD license.
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
* full text of the license. */