Skip to content

Commit 4889a08

Browse files
jasondaviesjasondavies
committed
Merge remote-tracking branch 'mbostock/v2.8.0' into builtin-properties
Conflicts: d3.v2.min.js
2 parents d728a49 + b9170fb commit 4889a08

60 files changed

Lines changed: 2374 additions & 1353 deletions

Some content is hidden

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

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2010, Michael Bostock
1+
Copyright (c) 2012, Michael Bostock
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎Makefile‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ d3.core.js: \
113113
src/core/transition-transition.js \
114114
src/core/timer.js \
115115
src/core/transform.js \
116+
src/core/mouse.js \
117+
src/core/touches.js \
116118
src/core/noop.js
117119

118120
d3.scale.js: \
@@ -189,21 +191,14 @@ d3.time.js: \
189191
src/time/format.js \
190192
src/time/format-utc.js \
191193
src/time/format-iso.js \
192-
src/time/range.js \
194+
src/time/interval.js \
193195
src/time/second.js \
194-
src/time/seconds.js \
195196
src/time/minute.js \
196-
src/time/minutes.js \
197197
src/time/hour.js \
198-
src/time/hours.js \
199198
src/time/day.js \
200-
src/time/days.js \
201199
src/time/week.js \
202-
src/time/weeks.js \
203200
src/time/month.js \
204-
src/time/months.js \
205201
src/time/year.js \
206-
src/time/years.js \
207202
src/time/scale.js \
208203
src/time/scale-utc.js
209204

0 commit comments

Comments
 (0)