Commit 4e9cbcb3 authored by Mike Bostock's avatar Mike Bostock

Merge branch 'master' of git://github.com/guybedford/d3

Conflicts:
	package.json
parents 65ec4c7e 242e3518
......@@ -29,7 +29,14 @@
"browserify": "index-browserify.js",
"jspm": {
"main": "d3.js",
"files": ["d3.js"],
"shim": {
"d3": {
"exports": "d3"
}
},
"files": [
"d3.js"
],
"buildConfig": {
"uglify": true
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment