Merge branch 'master' into feat/shake

multiformats · Mar 25, 2017 · 4daa4a0 · 4daa4a0
2 parents 4cd595f + 2ea805c
commit 4daa4a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.gx/lastpubver b/.gx/lastpubver
@@ -1 +1 @@
-1.0.3: QmPtbDoz8i593CoReBAzgXdx5PTAN66xAofpendZb922kp
+1.0.4: QmVGtdTZdTFaLsaj2RwdVG8jcjNNcp1DE914DKZ2kHmXHw
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ go get -u github.com/whyrusleeping/gx
 go get -u github.com/whyrusleeping/gx-go
 cd <your-project-repository>
 gx init
-gx import https://github.com/multiformats/go-multistream
+gx import github.com/multiformats/go-multihash
 gx install --global
 gx-go --rewrite
 ```

diff --git a/package.json b/package.json
@@ -21,8 +21,14 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmdKCKycEwt8S5vZM5LQ96a3hCLQ5WF98z21wJFBBX8pJe",
-      "name": "keccak",
+      "hash": "QmQPWTeQJnJE7MYu6dJTiNTQRNuqBr41dis6UgY6Uekmgd",
+      "name": "keccakpg",
+      "version": "0.0.0"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmfJHywXQu98UeZtGJBQrPAR6AtmDjjbe3qjTo9piXHPnx",
+      "name": "murmur3",
       "version": "0.0.0"
     }
   ],
@@ -31,6 +37,6 @@
   "license": "MIT",
   "name": "go-multihash",
   "releaseCmd": "git commit -a -m \"gx release $VERSION\"",
-  "version": "1.0.3"
+  "version": "1.0.4"
 }