Merge branch 'three' of https://github.com/tschaub/openlayers into three

This commit is contained in:
Mike Adair
2012-06-19 10:18:21 -04:00
3 changed files with 5 additions and 3 deletions

View File

@@ -2,5 +2,8 @@ all:
java -jar plovr.jar serve main.json
build:
java -jar plovr.jar build main.json > index.js
jsdoc:
java -jar plovr.jar jsdoc main.json
.PHONY: build
.PHONY: build
.PHONY: jsdoc

View File

@@ -28,5 +28,5 @@
// "undefinedVars": "ERROR"
},
"jsdoc-html-output-path": "."
"jsdoc-html-output-path": "jsdoc"
}

View File

@@ -31,7 +31,6 @@ ol.bounds = function(opt_arg){
var x = 0;
var y = 0;
var z;
var projection;
if (goog.isArray(opt_arg)) {
minX = opt_arg[0];