Merge branch 'master' of github.com:openlayers/openlayers into transform
Conflicts: theme/default/style.css
This commit is contained in:
@@ -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. */
|
||||
|
||||
Reference in New Issue
Block a user