Post merge build

R-Lum · Nov 3, 2023 · 3cebcd4 · 3cebcd4
1 parent e439d1b
commit 3cebcd4
Show file tree

Hide file tree

Showing 45 changed files with 114 additions and 2,582 deletions.
diff --git a/Luminescence.BuildResults/Luminescence-Ex.timings.0.9.22.WARNING b/Luminescence.BuildResults/Luminescence-Ex.timings.0.9.22.WARNING
diff --git a/Luminescence.BuildResults/Luminescence-TimingExamples.0.9.23.pdf b/Luminescence.BuildResults/Luminescence-TimingExamples.0.9.23.pdf
diff --git a/Luminescence.BuildResults/Luminescence_0.9.22.pdf b/Luminescence.BuildResults/Luminescence_0.9.22.pdf
diff --git a/Luminescence.BuildResults/Luminescence_0.9.22.tar.gz b/Luminescence.BuildResults/Luminescence_0.9.22.tar.gz
diff --git a/Luminescence.BuildResults/Luminescence_0.9.23-Functions.csv b/Luminescence.BuildResults/Luminescence_0.9.23-Functions.csv
diff --git a/Luminescence.BuildResults/Luminescence_0.9.23-Functions.html b/Luminescence.BuildResults/Luminescence_0.9.23-Functions.html
diff --git a/Luminescence.BuildResults/Luminescence_0.9.23-Functions.tex b/Luminescence.BuildResults/Luminescence_0.9.23-Functions.tex
diff --git a/Luminescence.BuildResults/Luminescence_0.9.23-Functions_Markdown.md b/Luminescence.BuildResults/Luminescence_0.9.23-Functions_Markdown.md
diff --git a/Luminescence.BuildResults/Luminescence_0.9.23-bibliography.bib b/Luminescence.BuildResults/Luminescence_0.9.23-bibliography.bib
@@ -2,11 +2,7 @@ @Manual{
   title = {Luminescence: Comprehensive Luminescence Dating Data Analysis},
   author = {Sebastian Kreutzer and Christoph Burow and Michael Dietze and Margret C. Fuchs and Christoph Schmidt and Manfred Fischer and Johannes Friedrich and Norbert Mercier and Anne Philippe and Svenja Riedesel and Martin Autzen and Dirk Mittelstrass and Harrison J. Gray and Jean-Michel Galharret},
   year = {2023},
-<<<<<<<< HEAD:Luminescence.BuildResults/Luminescence_0.9.22-bibliography.bib
-  note = {R package version 0.9.22},
-========
   note = {R package version 0.9.23},
->>>>>>>> dev_0.9.23:Luminescence.BuildResults/Luminescence_0.9.23-bibliography.bib
   url = {https://CRAN.R-project.org/package=Luminescence},
 }
 

diff --git a/Luminescence.BuildResults/Luminescence_0.9.23-fun_bibliography.bib b/Luminescence.BuildResults/Luminescence_0.9.23-fun_bibliography.bib
diff --git a/Luminescence.BuildResults/Luminescence_0.9.23.pdf b/Luminescence.BuildResults/Luminescence_0.9.23.pdf
diff --git a/Luminescence.BuildResults/Luminescence_0.9.23.tar.gz b/Luminescence.BuildResults/Luminescence_0.9.23.tar.gz
diff --git a/NEWS.Rmd b/NEWS.Rmd
@@ -8,7 +8,7 @@ header-includes:
 
 # Changes in version `r RLumBuild::.get_pkg_version()` (`r Sys.Date()`)
 
-**This package version requires R >= 4.1**
+**This package version requires R >= 4.2**
 
 ## Bugfixes and changes
 

diff --git a/NEWS.md b/NEWS.md
@@ -7,7 +7,7 @@
 
 # Changes in version 0.9.23 (2023-11-03)
 
-**This package version requires R \>= 4.1**
+**This package version requires R \>= 4.2**
 
 ## Bugfixes and changes
 

diff --git a/man/RLum-class.Rd b/man/RLum-class.Rd
diff --git a/man/RLum.Analysis-class.Rd b/man/RLum.Analysis-class.Rd
diff --git a/man/RLum.Data.Curve-class.Rd b/man/RLum.Data.Curve-class.Rd
diff --git a/man/RLum.Data.Image-class.Rd b/man/RLum.Data.Image-class.Rd
diff --git a/man/RLum.Data.Spectrum-class.Rd b/man/RLum.Data.Spectrum-class.Rd
diff --git a/man/RLum.Results-class.Rd b/man/RLum.Results-class.Rd
diff --git a/man/Risoe.BINfileData-class.Rd b/man/Risoe.BINfileData-class.Rd
diff --git a/man/Risoe.BINfileData2RLum.Analysis.Rd b/man/Risoe.BINfileData2RLum.Analysis.Rd
diff --git a/man/Second2Gray.Rd b/man/Second2Gray.Rd
diff --git a/man/read_Daybreak2R.Rd b/man/read_Daybreak2R.Rd
diff --git a/man/read_PSL2R.Rd b/man/read_PSL2R.Rd
diff --git a/man/read_RF2R.Rd b/man/read_RF2R.Rd
diff --git a/man/read_SPE2R.Rd b/man/read_SPE2R.Rd
diff --git a/man/read_TIFF2R.Rd b/man/read_TIFF2R.Rd
diff --git a/man/read_XSYG2R.Rd b/man/read_XSYG2R.Rd
diff --git a/man/replicate_RLum.Rd b/man/replicate_RLum.Rd
diff --git a/man/report_RLum.Rd b/man/report_RLum.Rd
diff --git a/man/sTeve.Rd b/man/sTeve.Rd