Minor edits following rebase

RcppCore · Aug 6, 2024 · 42e3627 · 42e3627
1 parent 1ddce3c
commit 42e3627
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,17 +1,18 @@
 2024-08-06  Dirk Eddelbuettel  <[email protected]>
 
+	* DESCRIPTION (Version): Increment micro version in branch
+
 	* DESCRIPTION (Version, Date): RcppArmadillo 14.0.2
         * inst/NEWS.Rd: Idem
         * configure.ac: Idem
         * configure: Idem
+
 2024-08-04  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION (Authors@R): Added ORCID ID for Conrad
 
 2024-08-01  Dirk Eddelbuettel  <[email protected]>
 
-	* DESCRIPTION (Version, Date): Increment micro version, update date
-
 	* DESCRIPTION (Authors@R): Added, with ORCID IDs for Dirk, Romain, Doug
 
 2024-08-01  Conrad Sanderson  <[email protected]>

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,12 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 14.0.2-0
+Version: 14.0.2-0-1
 Date: 2024-08-06
-Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson
-Maintainer: Dirk Eddelbuettel <[email protected]>
-Version: 14.0.0-1-1
-Date: 2024-08-01
 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
                     comment = c(ORCID = "0000-0001-6419-907X")),
              person("Romain", "Francois", role = "aut",