Merge branch 'spmjs-master' into 3.4.9

mbostock · mbostock · commit 18e72cee55f8 · 2014-06-30T13:15:31.000-04:00
diff --git a/.spmignore b/.spmignore
@@ -0,0 +1,4 @@
+bin
+lib
+src
+test
diff --git a/package.json b/package.json
@@ -47,6 +47,9 @@
       "exports": "d3"
     }
   },
+  "spm": {
+    "main": "d3.js"
+  },
   "dependencies": {
     "jsdom": "0.5.7"
   },

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +bin
 +lib
 +src
 +test