Commit05ae762

Florian Plaza Oñate

committed

Merge remote-tracking branch 'upstream/master' into at-accessors-patch

2 parents823a4cd +cf02f45 commit05ae762Copy full SHA for 05ae762

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,8 @@`
	`1`	`+2015-08-18 Dirk Eddelbuettel <edd@debian.org>`
	`2`	`+`
	`3`	`+ * inst/unitTests/runit.Module.client.package.R: Disabled for bad`
	`4`	`+ interaction of Rcpp Modules and R 3.2.2`
	`5`	`+`
`1`	`6`	`2015-08-15 Florian Plaza Oñate <florian.plaza@jouy.inra.fr>`
`2`	`7`
`3`	`8`	`* inst/include/Rcpp/vector/converter.h: Correct conversion from const`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`Package: Rcpp`
`2`	`2`	`Title: Seamless R and C++ Integration`
`3`		`-Version: 0.12.0.1`
`4`		`-Date: 2015-08.15`
	`3`	`+Version: 0.12.0.2`
	`4`	`+Date: 2015-08-17`
`5`	`5`	`Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey,`
`6`	`6`	`Qiang Kou, Douglas Bates and John Chambers`
`7`	`7`	`Maintainer: Dirk Eddelbuettel <edd@debian.org>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/usr/bin/r -t`
`2`	`2`	`# hey emacs, please make this use -- tab-width: 4 --`
`3`	`3`	`#`
`4`		`-# Copyright (C) 2010 -2014 Dirk Eddelbuettel and Romain Francois`
	`4`	`+# Copyright (C) 2010 -2015 Dirk Eddelbuettel and Romain Francois`
`5`	`5`	`#`
`6`	`6`	`# This file is part of Rcpp.`
`7`	`7`	`#`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/usr/bin/r -t`
`2`	`2`	`# hey emacs, please make this use -- tab-width: 4 --`
`3`	`3`	`#`
`4`		`-# Copyright (C) 2010 -2013 John Chambers, Dirk Eddelbuettel and Romain Francois`
	`4`	`+# Copyright (C) 2010 -2015 John Chambers, Dirk Eddelbuettel and Romain Francois`
`5`	`5`	`#`
`6`	`6`	`# This file is part of Rcpp.`
`7`	`7`	`#`
`@@ -32,6 +32,7 @@`
`32`	`32`	`.onWindows<-.Platform$OS.type=="windows"`
`33`	`33`
`34`	`34`	`.runThisTest<- Sys.getenv("RunAllRcppTests")=="yes"`
	`35`	`+.runThisTest<-FALSE## FIXME`
`35`	`36`
`36`	`37`	`if (.runThisTest&&!.badOSX&&!.onWindows) {`
`37`	`38`

Comments

(0)