new upstream version 1.13 (plus two PRs from here) (#30)

eddelbuettel · Oct 9, 2018 · 3af4d39 · 3af4d39
1 parent 0e907b3
commit 3af4d39
Show file tree

Hide file tree

Showing 5 changed files with 408 additions and 112 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-07  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/annoylib.h: New upstream version 1.13 plus two PRs by
+	Aaron and Dirk, respectively.
+	* inst/include/mman.h: Idem
+
 2018-10-06  Aaron Lun  <aaron.lun@cruk.cam.ac.uk>
 
 	* vignettes/rcppannoy.Rmd: New vignette on using Annoy from C++
@@ -10,7 +16,7 @@
 
 2017-12-16  Dirk Eddelbuettel  <edd@debian.org>
 
-	* inst/include/kissranom.h: New upstream version
+	* inst/include/kissrandom.h: New upstream version
 	* inst/include/annoylib.h: Idem; plus some small changes to avoid
 	g++ warnings, also sent upstream
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: RcppAnnoy
 Type: Package
 Title: 'Rcpp' Bindings for 'Annoy', a Library for Approximate Nearest Neighbors
-Version: 0.0.10.1
-Date: 2017-12-16
+Version: 0.0.10.2
+Date: 2018-10-07
 Author: Dirk Eddelbuettel
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
 Description: 'Annoy' is a small C++ library for Approximate Nearest Neighbors 

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -5,12 +5,12 @@
 
 \section{Changes in version 0.0.11 (2018-10-yy)}{
   \itemize{
-    \item Synchronized with Annoy upstream \ghpr{26}
+    \item Synchronized with Annoy upstream (\ghpr{26} and \ghpr{30}).
     \item Added new Hamming distance measure functionality; should be
     considered experimental as the functionality is on integer values.
     \item Travis CI use was updated to the R 3.5 PPA (\ghpr{28})
     \item New vignette about Annoy use from C++ via Rcpp (Aaron Lun
-    \ghpr{29) addressing \ghit{19}).
+    \ghpr{29} addressing \ghit{19}).
   }
 }