Skip to content

Commit b0686e2

Browse files
mbostockmbostock
committed
Merge branch '2.10.0'
2 parents 108d65d + ee03eb6 commit b0686e2

69 files changed

Lines changed: 1975 additions & 976 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ NODE_PATH ?= ./node_modules
44
JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
55
JS_BEAUTIFIER = $(NODE_PATH)/uglify-js/bin/uglifyjs -b -i 2 -nm -ns
66
JS_TESTER = $(NODE_PATH)/vows/bin/vows
7+
LOCALE ?= en_US
78

89
all: \
910
d3.v2.js \
@@ -19,7 +20,7 @@ all: \
1920
d3.svg.js \
2021
d3.behavior.js \
2122
d3.layout.js \
22-
d3.csv.js \
23+
d3.dsv.js \
2324
d3.geo.js \
2425
d3.geom.js \
2526
d3.time.js \
@@ -80,6 +81,9 @@ d3.core.js: \
8081
src/core/uninterpolate.js \
8182
src/core/rgb.js \
8283
src/core/hsl.js \
84+
src/core/hcl.js \
85+
src/core/lab.js \
86+
src/core/xyz.js \
8387
src/core/selection.js \
8488
src/core/selection-select.js \
8589
src/core/selection-selectAll.js \
@@ -118,6 +122,7 @@ d3.core.js: \
118122
src/core/transition-duration.js \
119123
src/core/transition-each.js \
120124
src/core/transition-transition.js \
125+
src/core/tween.js \
121126
src/core/timer.js \
122127
src/core/mouse.js \
123128
src/core/touches.js \
@@ -136,6 +141,7 @@ d3.scale.js: \
136141
src/scale/category.js \
137142
src/scale/quantile.js \
138143
src/scale/quantize.js \
144+
src/scale/threshold.js \
139145
src/scale/identity.js
140146

141147
d3.svg.js: \
@@ -188,13 +194,14 @@ d3.geo.js: \
188194
src/geo/greatArc.js \
189195
src/geo/greatCircle.js
190196

191-
d3.csv.js: \
192-
src/csv/csv.js \
193-
src/csv/parse.js \
194-
src/csv/format.js
197+
d3.dsv.js: \
198+
src/dsv/dsv.js \
199+
src/dsv/csv.js \
200+
src/dsv/tsv.js
195201

196202
d3.time.js: \
197203
src/time/time.js \
204+
src/time/format-$(LOCALE).js \
198205
src/time/format.js \
199206
src/time/format-utc.js \
200207
src/time/format-iso.js \

0 commit comments

Comments
 (0)