Skip to content

Commit

Permalink
Merge branch '2.10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbostock committed Aug 10, 2012
2 parents 108d65d + ee03eb6 commit b0686e2
Show file tree
Hide file tree
Showing 69 changed files with 1,975 additions and 976 deletions.
17 changes: 12 additions & 5 deletions Makefile
Expand Up @@ -4,6 +4,7 @@ NODE_PATH ?= ./node_modules
JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
JS_BEAUTIFIER = $(NODE_PATH)/uglify-js/bin/uglifyjs -b -i 2 -nm -ns
JS_TESTER = $(NODE_PATH)/vows/bin/vows
LOCALE ?= en_US

all: \
d3.v2.js \
Expand All @@ -19,7 +20,7 @@ all: \
d3.svg.js \
d3.behavior.js \
d3.layout.js \
d3.csv.js \
d3.dsv.js \
d3.geo.js \
d3.geom.js \
d3.time.js \
Expand Down Expand Up @@ -80,6 +81,9 @@ d3.core.js: \
src/core/uninterpolate.js \
src/core/rgb.js \
src/core/hsl.js \
src/core/hcl.js \
src/core/lab.js \
src/core/xyz.js \
src/core/selection.js \
src/core/selection-select.js \
src/core/selection-selectAll.js \
Expand Down Expand Up @@ -118,6 +122,7 @@ d3.core.js: \
src/core/transition-duration.js \
src/core/transition-each.js \
src/core/transition-transition.js \
src/core/tween.js \
src/core/timer.js \
src/core/mouse.js \
src/core/touches.js \
Expand All @@ -136,6 +141,7 @@ d3.scale.js: \
src/scale/category.js \
src/scale/quantile.js \
src/scale/quantize.js \
src/scale/threshold.js \
src/scale/identity.js

d3.svg.js: \
Expand Down Expand Up @@ -188,13 +194,14 @@ d3.geo.js: \
src/geo/greatArc.js \
src/geo/greatCircle.js

d3.csv.js: \
src/csv/csv.js \
src/csv/parse.js \
src/csv/format.js
d3.dsv.js: \
src/dsv/dsv.js \
src/dsv/csv.js \
src/dsv/tsv.js

d3.time.js: \
src/time/time.js \
src/time/format-$(LOCALE).js \
src/time/format.js \
src/time/format-utc.js \
src/time/format-iso.js \
Expand Down

0 comments on commit b0686e2

Please sign in to comment.