Merge branch 'dborzov-update-warning'

ipfs · Oct 10, 2014 · 16b5345 · 16b5345
2 parents 555bc87 + afec2d3
commit 16b5345
Show file tree

Hide file tree

Showing 11 changed files with 569 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# ipfs can generate profiling dump files
+cpu.prof
+
 *.swp
 .ipfsconfig
 *.out

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go b/Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go