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

2013-03-03 15:52:40 +01:00
parent b247031fe2 7126d63db5
commit 5a73529da5
40 changed files with 746 additions and 327 deletions
@@ -52,6 +52,12 @@ Proj4js.Point.prototype.y;
 Proj4js.Proj = function(srsCode, opt_callback) {};


+/**
+ * @type {string}
+ */
+Proj4js.Proj.prototype.axis;
+
+
 /**
 * @type {string}
 */