Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Conflicts:
	DESCRIPTION
	README.md
  • Loading branch information...
commit 76c84a60b794d28705383529bf47298d80d33c70 2 parents 73f3eb7 + 443da01
@takluyver takluyver authored
Showing with 7 additions and 0 deletions.
  1. +2 −0  NAMESPACE
  2. +1 −0  README.md
  3. +2 −0  man/IRkernel.Rd
  4. +2 −0  man/main.Rd
View
2  NAMESPACE
@@ -1,3 +1,5 @@
+# Generated by roxygen2 (4.0.0): do not edit by hand
+
export(main)
import(digest)
import(evaluate)
View
1  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")
View
2  man/IRkernel.Rd
@@ -1,3 +1,5 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
+
\docType{package}
\name{IRkernel}
\alias{IRkernel}
View
2  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}
Please sign in to comment.
Something went wrong with that request. Please try again.