merged with master branch; aligned ChangeLog

eddelbuettel · eddelbuettel · commit 238109774764 · 2016-03-13T09:49:50.000-05:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-09  Colin Gillespie <csgillespie@gmail.com>
+
+        * vignettes/Rcpp-sugar.Rnw: Correct typos and indentation
+
 2016-03-09  Dirk Eddelbuettel  <edd@debian.org>
 
         * inst/include/Rcpp/stats/random/rlogis.h: Updated Emacs header and
@@ -22,7 +26,7 @@
         * inst/include/Rcpp/stats/random/rhyper.h: Idem
         * inst/include/Rcpp/stats/random/rpois.h: Idem
         * inst/include/Rcpp/stats/random/rsignrank.h: Idem
-        * inst/include/Rcpp/stats/random/rwilcox.h: Idem 
+        * inst/include/Rcpp/stats/random/rwilcox.h: Idem
 
 2016-03-07  Dirk Eddelbuettel  <edd@debian.org>
 
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -32,7 +32,9 @@
       further review by Bob Rudis).
       \item An entry was added concerning the hard-code limit of arguments to
       some constructor and function (cf \ghit{435}).
-      \item The Rcpp-FAQ now contains a table of content.
+      \item The Rcpp-FAQ vignette now contains a table of content.
+      \item Typos and indentation were corrected in the Rcpp Sugar vignette
+      (\ghpr{445} by Colin Gillespie).
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@`
`32`	`32`	`further review by Bob Rudis).`
`33`	`33`	`\item An entry was added concerning the hard-code limit of arguments to`
`34`	`34`	`some constructor and function (cf \ghit{435}).`
`35`		`- \item The Rcpp-FAQ now contains a table of content.`
	`35`	`+ \item The Rcpp-FAQ vignette now contains a table of content.`
	`36`	`+ \item Typos and indentation were corrected in the Rcpp Sugar vignette`
	`37`	`+ (\ghpr{445} by Colin Gillespie).`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`