Merge remote-tracking branch 'openlayers/master' into vector-api

This commit is contained in:
Tom Payne
2014-01-09 15:33:58 +01:00
9 changed files with 32 additions and 16 deletions

View File

@@ -10,7 +10,7 @@ goog.require('ol.style.Style');
/**
* @define {number} Timeout duration.
* @define {number} Animation duration.
*/
ol.interaction.DRAGZOOM_ANIMATION_DURATION = 200;