Merge upstream changes

nathan-russell · nathan-russell · commit e696eea7d0b2 · 2016-10-24T15:57:21.000-04:00
diff --git a/ChangeLog b/ChangeLog
@@ -7,6 +7,7 @@
 	* inst/include/Rcpp/traits/traits.h: Idem 
 	* inst/unitTests/cpp/Matrix.cpp: Idem
 	* inst/unitTests/runit.Matrix.R: Idem 
+
 2016-10-24  Qiang Kou  <qkou@umail.iu.edu>
 
         * inst/include/Rcpp/sugar/Range.h: Range sugar uses R_xlen_t as start/end type
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -18,8 +18,6 @@
       \item Added new Sugar functions \code{rowSums()}, \code{colSums()},
       \code{rowMeans()}, \code{colMeans()} (PR \ghpr{551} by Nathan Russell 
       fixing \ghit{549})
-      \item Added new (matrix) Sugar functions \code{eye()}, 
-      \code{ones()}, \code{zeros()} (PR \ghpr{566} by Nathan Russell)
       \item \code{Range} Sugar now used \code{R_xlen_t} type for start/end
       (PR \ghpr{568} by Qiang Kou)
     }

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`\item Added new Sugar functions \code{rowSums()}, \code{colSums()},`
`19`	`19`	`\code{rowMeans()}, \code{colMeans()} (PR \ghpr{551} by Nathan Russell`
`20`	`20`	`fixing \ghit{549})`
`21`		`- \item Added new (matrix) Sugar functions \code{eye()},`
`22`		`- \code{ones()}, \code{zeros()} (PR \ghpr{566} by Nathan Russell)`
`23`	`21`	`\item \code{Range} Sugar now used \code{R_xlen_t} type for start/end`
`24`	`22`	`(PR \ghpr{568} by Qiang Kou)`
`25`	`23`	`}`