Merge branch 'master' of github.com:takluyver/IR_kernel

Conflicts: DESCRIPTION README.md
IRkernel · Apr 4, 2014 · 76c84a6 · 76c84a6
2 parents 73f3eb7 + 443da01
commit 76c84a6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,3 +1,5 @@
+# Generated by roxygen2 (4.0.0): do not edit by hand
+
 export(main)
 import(digest)
 import(evaluate)

diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ We need devel versions of the following packages from Github for now due to rece
 
 ```coffee
 library(devtools)
+# Otherwise install with install.packages("devtools")
 install_github("armstrtw/rzmq")
 install_github("hadley/evaluate")
 install_github("jeroenooms/jsonlite")

diff --git a/man/IRkernel.Rd b/man/IRkernel.Rd
@@ -1,3 +1,5 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
+
 \docType{package}
 \name{IRkernel}
 \alias{IRkernel}

diff --git a/man/main.Rd b/man/main.Rd
@@ -1,3 +1,5 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
+
 \name{main}
 \alias{main}
 \title{Initialise and run the kernel}