Merge branch 'mbostock-master'

flyingoctopus · Mar 12, 2011 · 26662de · 26662de
2 parents 4223750 + a6d5b6f
commit 26662de
Show file tree

Hide file tree

Showing 16 changed files with 367 additions and 138 deletions.
diff --git a/Makefile b/Makefile
@@ -136,9 +136,12 @@ d3.geom.js: \
 tests: \
 	tests/test-append.test \
 	tests/test-attr.test \
+	tests/test-call.test \
 	tests/test-format.test \
 	tests/test-transition.test \
-	tests/test-scale-linear.test
+	tests/test-scale-linear.test \
+	tests/test-scale-sqrt.test \
+	tests/test-scale-pow.test
 
 %.min.js: %.js Makefile
 	@rm -f $@

diff --git a/d3.geo.min.js b/d3.geo.min.js
diff --git a/d3.geom.min.js b/d3.geom.min.js