Merge branch 'master' of github.com:openlayers/openlayers into transform

Conflicts:
	theme/default/style.css
This commit is contained in:
ahocevar
2013-01-09 14:31:52 +01:00
296 changed files with 2303 additions and 627 deletions

View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for
/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
* full list of contributors). Published under the 2-clause BSD license.
* See license.txt in the OpenLayers distribution or repository for the
* full text of the license. */