Merge remote-tracking branch 'origin/dev_0.9.7'

# Conflicts:
#	DESCRIPTION
#	Luminescence.BuildResults/Luminescence-TimingExamples.0.9.6.9000-41.pdf
#	Luminescence.BuildResults/Luminescence-TimingExamples.0.9.6.pdf
#	Luminescence.BuildResults/Luminescence-TimingExamples.0.9.7.pdf
#	Luminescence.BuildResults/Luminescence_0.9.6-Functions.csv
#	Luminescence.BuildResults/Luminescence_0.9.6-Functions.html
#	Luminescence.BuildResults/Luminescence_0.9.6-Functions.tex
#	Luminescence.BuildResults/Luminescence_0.9.6-Functions_Markdown.md
#	Luminescence.BuildResults/Luminescence_0.9.6-bibliography.bib
#	Luminescence.BuildResults/Luminescence_0.9.6-fun_bibliography.bib
#	Luminescence.BuildResults/Luminescence_0.9.6.9000-41-Functions.csv
#	Luminescence.BuildResults/Luminescence_0.9.6.9000-41-Functions.html
#	Luminescence.BuildResults/Luminescence_0.9.6.9000-41-Functions.tex
#	Luminescence.BuildResults/Luminescence_0.9.6.9000-41-Functions_Markdown.md
#	Luminescence.BuildResults/Luminescence_0.9.6.9000-41-bibliography.bib
#	Luminescence.BuildResults/Luminescence_0.9.6.9000-41-fun_bibliography.bib
#	Luminescence.BuildResults/Luminescence_0.9.7-Functions.csv
#	Luminescence.BuildResults/Luminescence_0.9.7-Functions.html
#	Luminescence.BuildResults/Luminescence_0.9.7-Functions.tex
#	Luminescence.BuildResults/Luminescence_0.9.7-Functions_Markdown.md
#	Luminescence.BuildResults/Luminescence_0.9.7-bibliography.bib
#	Luminescence.BuildResults/Luminescence_0.9.7-fun_bibliography.bib
#	NEWS.Rmd
#	NEWS.md
#	R/Luminescence-package.R
#	cran-comments.md
#	man/Analyse_SAR.OSLdata.Rd
#	man/CW2pHMi.Rd
#	man/CW2pLM.Rd
#	man/CW2pLMi.Rd
#	man/CW2pPMi.Rd
#	man/GitHub-API.Rd
#	man/PSL2Risoe.BINfileData.Rd
#	man/RLum-class.Rd
#	man/RLum.Analysis-class.Rd
#	man/RLum.Data.Curve-class.Rd
#	man/RLum.Data.Image-class.Rd
#	man/RLum.Data.Spectrum-class.Rd
#	man/RLum.Results-class.Rd
#	man/Risoe.BINfileData-class.Rd
#	man/Risoe.BINfileData2RLum.Analysis.Rd
#	man/Second2Gray.Rd
#	man/analyse_Al2O3C_CrossTalk.Rd
#	man/analyse_Al2O3C_ITC.Rd
#	man/analyse_Al2O3C_Measurement.Rd
#	man/analyse_FadingMeasurement.Rd
#	man/analyse_IRSAR.RF.Rd
#	man/analyse_SAR.CWOSL.Rd
#	man/analyse_SAR.TL.Rd
#	man/analyse_baSAR.Rd
#	man/analyse_pIRIRSequence.Rd
#	man/analyse_portableOSL.Rd
#	man/app_RLum.Rd
#	man/apply_CosmicRayRemoval.Rd
#	man/apply_EfficiencyCorrection.Rd
#	man/bin_RLum.Data.Rd
#	man/calc_AliquotSize.Rd
#	man/calc_AverageDose.Rd
#	man/calc_CentralDose.Rd
#	man/calc_CommonDose.Rd
#	man/calc_CosmicDoseRate.Rd
#	man/calc_FadingCorr.Rd
#	man/calc_FastRatio.Rd
#	man/calc_FiniteMixture.Rd
#	man/calc_FuchsLang2001.Rd
#	man/calc_HomogeneityTest.Rd
#	man/calc_Huntley2006.Rd
#	man/calc_IEU.Rd
#	man/calc_Kars2008.Rd
#	man/calc_Lamothe2003.Rd
#	man/calc_MaxDose.Rd
#	man/calc_MinDose.Rd
#	man/calc_OSLLxTxRatio.Rd
#	man/calc_SourceDoseRate.Rd
#	man/calc_Statistics.Rd
#	man/calc_TLLxTxRatio.Rd
#	man/calc_ThermalLifetime.Rd
#	man/calc_WodaFuchs2008.Rd
#	man/calc_gSGC.Rd
#	man/convert_Activity2Concentration.Rd
#	man/convert_BIN2CSV.Rd
#	man/convert_Daybreak2CSV.Rd
#	man/convert_PSL2CSV.Rd
#	man/convert_RLum2Risoe.BINfileData.Rd
#	man/convert_Wavelength2Energy.Rd
#	man/convert_XSYG2CSV.Rd
#	man/extract_IrradiationTimes.Rd
#	man/fit_CWCurve.Rd
#	man/fit_LMCurve.Rd
#	man/fit_OSLLifeTimes.Rd
#	man/fit_SurfaceExposure.Rd
#	man/fit_ThermalQuenching.Rd
#	man/get_Layout.Rd
#	man/get_Quote.Rd
#	man/get_RLum.Rd
#	man/get_Risoe.BINfileData.Rd
#	man/get_rightAnswer.Rd
#	man/length_RLum.Rd
#	man/merge_RLum.Analysis.Rd
#	man/merge_RLum.Data.Curve.Rd
#	man/merge_RLum.Rd
#	man/merge_RLum.Results.Rd
#	man/merge_Risoe.BINfileData.Rd
#	man/names_RLum.Rd
#	man/plot_AbanicoPlot.Rd
#	man/plot_DRCSummary.Rd
#	man/plot_DRTResults.Rd
#	man/plot_DetPlot.Rd
#	man/plot_FilterCombinations.Rd
#	man/plot_GrowthCurve.Rd
#	man/plot_Histogram.Rd
#	man/plot_KDE.Rd
#	man/plot_NRt.Rd
#	man/plot_RLum.Analysis.Rd
#	man/plot_RLum.Data.Curve.Rd
#	man/plot_RLum.Data.Image.Rd
#	man/plot_RLum.Data.Spectrum.Rd
#	man/plot_RLum.Rd
#	man/plot_RLum.Results.Rd
#	man/plot_RadialPlot.Rd
#	man/plot_Risoe.BINfileData.Rd
#	man/plot_ViolinPlot.Rd
#	man/read_BIN2R.Rd
#	man/read_Daybreak2R.Rd
#	man/read_PSL2R.Rd
#	man/read_SPE2R.Rd
#	man/read_XSYG2R.Rd
#	man/replicate_RLum.Rd
#	man/report_RLum.Rd
#	man/sTeve.Rd
#	man/scale_GammaDose.Rd
#	man/set_RLum.Rd
#	man/set_Risoe.BINfileData.Rd
#	man/smooth_RLum.Rd
#	man/structure_RLum.Rd
#	man/template_DRAC.Rd
#	man/tune_Data.Rd
#	man/use_DRAC.Rd
#	man/verify_SingleGrainData.Rd
#	man/write_R2BIN.Rd
#	man/write_RLum2CSV.Rd

.travis.yml

@@ -56,9 +56,12 @@ matrix:
   - os: osx
     r: release
     before_install:
-      #- sudo rm '/usr/local/include/c++'
       - sudo rm '/usr/local/bin/gfortran'
-      - brew install gcc
+      - |
+        ## Test whether gcc is already installed
+        if ! brew ls --versions gcc > /dev/null; then
+            brew install gcc
+          fi
       - brew install jags
       - brew install libssh2
       - brew install libgit2

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: Luminescence
 Type: Package
 Title: Comprehensive Luminescence Dating Data Analysis
-Version: 0.9.6
-Date: 2019-12-04
+Version: 0.9.7
+Date: 2020-01-04
 Author: Sebastian Kreutzer [aut, trl, cre, dtc] (<https://orcid.org/0000-0002-0734-2199>),
     Christoph Burow [aut, trl, dtc] (<https://orcid.org/0000-0002-5023-4046>),
     Michael Dietze [aut] (<https://orcid.org/0000-0001-6063-1726>),