R – /branches/R-conflicts/doc/NEWS.Rd

Rev 76247 – Added NEWS item on conflict resolution changes.

luke — Mon, 18 Mar 2019 15:58:04 +0000

luke – 1 file(s) modified
Added NEWS item on conflict resolution changes.

~ /branches/R-conflicts/doc/NEWS.Rd

Rev 76246 – Merged changes from trunk through 76245

luke — Mon, 18 Mar 2019 15:56:43 +0000

luke – 30 file(s) modified
Merged changes from trunk through 76245

~ /branches/R-conflicts
~ /branches/R-conflicts/configure
~ /branches/R-conflicts/configure.ac
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/etc/Makeconf.in
~ /branches/R-conflicts/etc/Renviron.in
~ /branches/R-conflicts/Makeconf.in
~ /branches/R-conflicts/src/extra/blas/Makefile.in
~ /branches/R-conflicts/src/gnuwin32/fixed/etc/Makeconf
~ /branches/R-conflicts/src/library/base/man/make.unique.Rd
~ /branches/R-conflicts/src/library/base/man/Random.Rd
~ /branches/R-conflicts/src/library/base/R/eigen.R
~ /branches/R-conflicts/src/library/base/R/RNG.R
~ /branches/R-conflicts/src/library/base/R/stop.R
~ /branches/R-conflicts/src/library/grDevices/src/cairo/cairoFns.c
~ /branches/R-conflicts/src/library/grid/src/grid.c
~ /branches/R-conflicts/src/library/Makefile.in
~ /branches/R-conflicts/src/library/tools/R/admin.R
~ /branches/R-conflicts/src/library/tools/R/install.R
~ /branches/R-conflicts/src/library/utils/man/INSTALL.Rd
~ /branches/R-conflicts/src/library/utils/man/sessionInfo.Rd
~ /branches/R-conflicts/src/library/utils/R/sessionInfo.R
~ /branches/R-conflicts/src/main/eval.c
~ /branches/R-conflicts/src/main/Makefile.in
~ /branches/R-conflicts/src/main/sprintf.c
~ /branches/R-conflicts/src/modules/internet/Makefile.in
~ /branches/R-conflicts/src/modules/lapack/Makefile.in
~ /branches/R-conflicts/src/modules/X11/Makefile.in
~ /branches/R-conflicts/src/nmath/standalone/Makefile.in
~ /branches/R-conflicts/tests/reg-tests-1d.R

Rev 76225 – Merged changes from trunk through 76224

luke — Tue, 12 Mar 2019 20:20:00 +0000

luke – 105 file(s) modified
Merged changes from trunk through 76224

~ /branches/R-conflicts/configure
~ /branches/R-conflicts/doc/CRAN_mirrors.csv
~ /branches/R-conflicts/doc/manual/R-admin.texi
~ /branches/R-conflicts/doc/manual/R-exts.texi
~ /branches/R-conflicts/doc/manual/R-ints.texi
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/m4/R.m4
~ /branches/R-conflicts/src/extra/tzone/Notes
~ /branches/R-conflicts/src/gnuwin32/extra.c
~ /branches/R-conflicts/src/gnuwin32/installer/types3264.iss
~ /branches/R-conflicts/src/include/Rmath.h0.in
~ /branches/R-conflicts/src/include/R_ext/Random.h
~ /branches/R-conflicts/src/library/base/man/class.Rd
~ /branches/R-conflicts/src/library/base/man/options.Rd
~ /branches/R-conflicts/src/library/base/man/Random.Rd
~ /branches/R-conflicts/src/library/base/man/stopifnot.Rd
~ /branches/R-conflicts/src/library/base/R/all.equal.R
~ /branches/R-conflicts/src/library/base/R/eigen.R
~ /branches/R-conflicts/src/library/base/R/files.R
~ /branches/R-conflicts/src/library/base/R/namespace.R
~ /branches/R-conflicts/src/library/base/R/RNG.R
~ /branches/R-conflicts/src/library/base/R/Scripts.R
~ /branches/R-conflicts/src/library/base/R/stop.R
~ /branches/R-conflicts/src/library/datasets/man/crimtab.Rd
~ /branches/R-conflicts/src/library/graphics/man/axTicks.Rd
~ /branches/R-conflicts/src/library/graphics/R/axis.R
~ /branches/R-conflicts/src/library/grDevices/man/axisTicks.Rd
~ /branches/R-conflicts/src/library/grDevices/tests/ps-tests.Rout.save
~ /branches/R-conflicts/src/library/grDevices/tests/xfig-tests.Rout.save
~ /branches/R-conflicts/src/library/grid/inst/doc/changes.txt
~ /branches/R-conflicts/src/library/grid/src/gpar.c
~ /branches/R-conflicts/src/library/grid/src/grid.c
~ /branches/R-conflicts/src/library/grid/src/grid.h
~ /branches/R-conflicts/src/library/grid/tests/testls.Rout.save
~ /branches/R-conflicts/src/library/methods/R/packageName.R
~ /branches/R-conflicts/src/library/methods/R/RClassUtils.R
~ /branches/R-conflicts/src/library/methods/R/RMethodUtils.R
~ /branches/R-conflicts/src/library/parallel/tests/multicore2.Rout.save
~ /branches/R-conflicts/src/library/parallel/tests/snow2.Rout.save
~ /branches/R-conflicts/src/library/profile/Common.R
~ /branches/R-conflicts/src/library/stats/tests/bandwidth.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/glm.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/ks-test.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/nls.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/simulate.Rout.save
~ /branches/R-conflicts/src/library/tools/R/check.R
~ /branches/R-conflicts/src/library/tools/R/install.R
~ /branches/R-conflicts/src/library/tools/R/parseRd.R
~ /branches/R-conflicts/src/library/tools/R/QC.R
~ /branches/R-conflicts/src/library/tools/R/translations.R
~ /branches/R-conflicts/src/library/utils/man/example.Rd
~ /branches/R-conflicts/src/library/utils/man/INSTALL.Rd
~ /branches/R-conflicts/src/library/utils/R/example.R
~ /branches/R-conflicts/src/library/utils/R/sessionInfo.R
~ /branches/R-conflicts/src/library/utils/R/windows/sysutils.R
~ /branches/R-conflicts/src/library/utils/R/zzz.R
~ /branches/R-conflicts/src/main/character.c
~ /branches/R-conflicts/src/main/grep.c
~ /branches/R-conflicts/src/main/names.c
~ /branches/R-conflicts/src/main/random.c
~ /branches/R-conflicts/src/main/RNG.c
~ /branches/R-conflicts/src/main/subassign.c
~ /branches/R-conflicts/src/modules/internet/libcurl.c
~ /branches/R-conflicts/src/nmath/standalone/sunif.c
~ /branches/R-conflicts/src/nmath/wilcox.c
~ /branches/R-conflicts/tests/any-all.Rout.save
~ /branches/R-conflicts/tests/arith-true.Rout.save
~ /branches/R-conflicts/tests/arith.Rout.save
~ /branches/R-conflicts/tests/complex.Rout.save
~ /branches/R-conflicts/tests/d-p-q-r-tests.R
~ /branches/R-conflicts/tests/d-p-q-r-tests.Rout.save
~ /branches/R-conflicts/tests/datasets.Rout.save
~ /branches/R-conflicts/tests/datetime2.Rout.save
~ /branches/R-conflicts/tests/demos.Rout.save
~ /branches/R-conflicts/tests/eval-etc-2.Rout.save
~ /branches/R-conflicts/tests/eval-etc.Rout.save
~ /branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/graphics-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grid-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/splines-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats4-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/tools-Ex.Rout.save
~ /branches/R-conflicts/tests/iec60559.Rout.save
~ /branches/R-conflicts/tests/internet.Rout.save
~ /branches/R-conflicts/tests/isas-tests.Rout.save
~ /branches/R-conflicts/tests/lapack.Rout.save
~ /branches/R-conflicts/tests/lm-tests.Rout.save
~ /branches/R-conflicts/tests/method-dispatch.Rout.save
~ /branches/R-conflicts/tests/ok-errors.Rout.save
~ /branches/R-conflicts/tests/p-r-random-tests.R
~ /branches/R-conflicts/tests/p-r-random-tests.Rout.save
~ /branches/R-conflicts/tests/print-tests.Rout.save
~ /branches/R-conflicts/tests/R-intro.Rout.save
~ /branches/R-conflicts/tests/reg-examples3.Rout.save
~ /branches/R-conflicts/tests/reg-IO.Rout.save
~ /branches/R-conflicts/tests/reg-IO2.Rout.save
~ /branches/R-conflicts/tests/reg-S4.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1a.R
~ /branches/R-conflicts/tests/reg-tests-1b.R
~ /branches/R-conflicts/tests/reg-tests-1d.R
~ /branches/R-conflicts/tests/reg-tests-2.Rout.save
~ /branches/R-conflicts/tests/reg-tests-3.Rout.save
~ /branches/R-conflicts/tests/simple-true.Rout.save

Rev 76153 – Merged changes from trunk through 76152

luke — Sun, 24 Feb 2019 14:28:26 +0000

luke – 110 file(s) modified
Merged changes from trunk through 76152

~ /branches/R-conflicts/doc/manual/R-exts.texi
~ /branches/R-conflicts/doc/manual/R-ints.texi
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/share/R/examples-header.R
~ /branches/R-conflicts/share/texmf/bibtex/bib/RJournal.bib
~ /branches/R-conflicts/src/appl/maxcol.c
~ /branches/R-conflicts/src/library/base/man/Extract.data.frame.Rd
~ /branches/R-conflicts/src/library/base/man/Extract.Rd
~ /branches/R-conflicts/src/library/datasets/man/swiss.Rd
~ /branches/R-conflicts/src/library/grDevices/tests/ps-tests.Rout.save
~ /branches/R-conflicts/src/library/grDevices/tests/xfig-tests.Rout.save
~ /branches/R-conflicts/src/library/grid/inst/doc/changes.txt
~ /branches/R-conflicts/src/library/grid/man/drawDetails.Rd
~ /branches/R-conflicts/src/library/grid/man/grid.path.Rd
+ /branches/R-conflicts/src/library/grid/man/grobCoords.Rd (copied from /trunk/src/library/grid/man/grobCoords.Rd@76152)
~ /branches/R-conflicts/src/library/grid/NAMESPACE
+ /branches/R-conflicts/src/library/grid/R/coords.R (copied from /trunk/src/library/grid/R/coords.R@76152)
~ /branches/R-conflicts/src/library/grid/R/gpar.R
~ /branches/R-conflicts/src/library/grid/R/grob.R
+ /branches/R-conflicts/src/library/grid/tests/coords.R (copied from /trunk/src/library/grid/tests/coords.R@76152)
~ /branches/R-conflicts/src/library/grid/tests/testls.Rout.save
~ /branches/R-conflicts/src/library/methods/R/RClassUtils.R
~ /branches/R-conflicts/src/library/methods/R/zzz.R
~ /branches/R-conflicts/src/library/parallel/tests/multicore2.Rout.save
~ /branches/R-conflicts/src/library/parallel/tests/snow2.Rout.save
~ /branches/R-conflicts/src/library/Recommended/Makefile.in
~ /branches/R-conflicts/src/library/Recommended/Makefile.win
~ /branches/R-conflicts/src/library/stats/man/hclust.Rd
~ /branches/R-conflicts/src/library/stats/man/model.matrix.Rd
~ /branches/R-conflicts/src/library/stats/man/plot.lm.Rd
~ /branches/R-conflicts/src/library/stats/man/t.test.Rd
~ /branches/R-conflicts/src/library/stats/R/models.R
~ /branches/R-conflicts/src/library/stats/R/plot.lm.R
~ /branches/R-conflicts/src/library/stats/R/t.test.R
~ /branches/R-conflicts/src/library/stats/tests/bandwidth.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/glm.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/ks-test.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/nls.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/simulate.Rout.save
~ /branches/R-conflicts/src/library/tools/man/makeLazyLoading.Rd
~ /branches/R-conflicts/src/library/tools/R/assertCondition.R
~ /branches/R-conflicts/src/library/tools/R/build.R
~ /branches/R-conflicts/src/library/tools/R/check.R
~ /branches/R-conflicts/src/library/tools/R/checktools.R
~ /branches/R-conflicts/src/library/tools/R/citation.R
~ /branches/R-conflicts/src/library/tools/R/CRANtools.R
~ /branches/R-conflicts/src/library/tools/R/doitools.R
~ /branches/R-conflicts/src/library/tools/R/install.R
~ /branches/R-conflicts/src/library/tools/R/license.R
~ /branches/R-conflicts/src/library/tools/R/makeLazyLoad.R
~ /branches/R-conflicts/src/library/tools/R/QC.R
~ /branches/R-conflicts/src/library/tools/R/Rd.R
~ /branches/R-conflicts/src/library/tools/R/urltools.R
~ /branches/R-conflicts/src/library/tools/R/utils.R
~ /branches/R-conflicts/src/library/tools/R/Vignettes.R
~ /branches/R-conflicts/src/library/utils/man/data.Rd
~ /branches/R-conflicts/src/library/utils/man/INSTALL.Rd
~ /branches/R-conflicts/src/library/utils/R/apropos.R
~ /branches/R-conflicts/src/library/utils/R/aspell.R
~ /branches/R-conflicts/src/library/utils/R/citation.R
~ /branches/R-conflicts/src/library/utils/R/data.R
~ /branches/R-conflicts/src/library/utils/R/help.search.R
~ /branches/R-conflicts/src/library/utils/R/packages.R
~ /branches/R-conflicts/src/library/utils/R/RShowDoc.R
~ /branches/R-conflicts/src/library/utils/R/URLencode.R
~ /branches/R-conflicts/src/library/utils/R/write.table.R
~ /branches/R-conflicts/src/library/utils/R/zip.R
~ /branches/R-conflicts/src/main/grep.c
~ /branches/R-conflicts/src/main/random.c
~ /branches/R-conflicts/src/main/RNG.c
~ /branches/R-conflicts/src/modules/internet/libcurl.c
~ /branches/R-conflicts/tests/any-all.Rout.save
~ /branches/R-conflicts/tests/arith-true.Rout.save
~ /branches/R-conflicts/tests/arith.Rout.save
~ /branches/R-conflicts/tests/complex.Rout.save
~ /branches/R-conflicts/tests/d-p-q-r-tests.Rout.save
~ /branches/R-conflicts/tests/datasets.Rout.save
~ /branches/R-conflicts/tests/datetime2.Rout.save
~ /branches/R-conflicts/tests/demos.Rout.save
~ /branches/R-conflicts/tests/eval-etc-2.Rout.save
~ /branches/R-conflicts/tests/eval-etc.Rout.save
~ /branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/graphics-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grid-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/splines-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats4-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/tools-Ex.Rout.save
~ /branches/R-conflicts/tests/iec60559.Rout.save
~ /branches/R-conflicts/tests/internet.Rout.save
~ /branches/R-conflicts/tests/isas-tests.Rout.save
~ /branches/R-conflicts/tests/lapack.Rout.save
~ /branches/R-conflicts/tests/lm-tests.Rout.save
~ /branches/R-conflicts/tests/method-dispatch.Rout.save
~ /branches/R-conflicts/tests/ok-errors.Rout.save
~ /branches/R-conflicts/tests/p-r-random-tests.Rout.save
~ /branches/R-conflicts/tests/Pkgs/exNSS4/NAMESPACE
~ /branches/R-conflicts/tests/Pkgs/exNSS4/R/nss4.R
~ /branches/R-conflicts/tests/print-tests.Rout.save
~ /branches/R-conflicts/tests/R-intro.Rout.save
~ /branches/R-conflicts/tests/reg-examples3.Rout.save
~ /branches/R-conflicts/tests/reg-IO.Rout.save
~ /branches/R-conflicts/tests/reg-IO2.Rout.save
~ /branches/R-conflicts/tests/reg-packages.R
~ /branches/R-conflicts/tests/reg-S4.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1d.R
~ /branches/R-conflicts/tests/reg-tests-2.Rout.save
~ /branches/R-conflicts/tests/reg-tests-3.Rout.save
~ /branches/R-conflicts/tests/simple-true.Rout.save

Rev 76073 – Merged changes from trunk through 76071

luke — Fri, 08 Feb 2019 12:18:46 +0000

luke – 27 file(s) modified
Merged changes from trunk through 76071

~ /branches/R-conflicts/doc/CRAN_mirrors.csv
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/src/library/base/man/Extract.data.frame.Rd
~ /branches/R-conflicts/src/library/base/R/seq.R
~ /branches/R-conflicts/src/library/grid/inst/doc/changes.txt
~ /branches/R-conflicts/src/library/grid/man/grid.path.Rd
~ /branches/R-conflicts/src/library/grid/R/primitives.R
~ /branches/R-conflicts/src/library/grid/src/grid.c
~ /branches/R-conflicts/src/library/tools/R/install.R
~ /branches/R-conflicts/src/library/tools/R/utils.R
~ /branches/R-conflicts/src/library/utils/R/aspell.R
~ /branches/R-conflicts/src/library/utils/R/bug.report.R
~ /branches/R-conflicts/src/library/utils/R/completion.R
~ /branches/R-conflicts/src/library/utils/R/frametools.R
~ /branches/R-conflicts/src/library/utils/R/help.search.R
~ /branches/R-conflicts/src/library/utils/R/menu.R
~ /branches/R-conflicts/src/library/utils/R/objects.R
~ /branches/R-conflicts/src/library/utils/R/packages.R
~ /branches/R-conflicts/src/library/utils/R/read.fortran.R
~ /branches/R-conflicts/src/library/utils/R/strcapture.R
~ /branches/R-conflicts/src/library/utils/R/summRprof.R
~ /branches/R-conflicts/src/library/utils/R/Sweave.R
~ /branches/R-conflicts/src/library/utils/R/SweaveDrivers.R
~ /branches/R-conflicts/src/library/utils/R/widgets.R
~ /branches/R-conflicts/src/library/utils/R/windows/sysutils.R
~ /branches/R-conflicts/tests/Examples/grid-Ex.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1d.R

Rev 76063 – Merged changes from trunk through 76062

luke — Tue, 05 Feb 2019 23:19:55 +0000

luke – 236 file(s) modified
Merged changes from trunk through 76062

~ /branches/R-conflicts/config.site
~ /branches/R-conflicts/configure
~ /branches/R-conflicts/configure.ac
~ /branches/R-conflicts/doc/CRAN_mirrors.csv
~ /branches/R-conflicts/doc/manual/Makefile.in
~ /branches/R-conflicts/doc/manual/Makefile.win
~ /branches/R-conflicts/doc/manual/R-admin.texi
~ /branches/R-conflicts/doc/manual/R-exts.texi
~ /branches/R-conflicts/doc/manual/R-ints.texi
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/etc/Makeconf.in
~ /branches/R-conflicts/m4/cxx_11.m4
~ /branches/R-conflicts/m4/libtool.m4
~ /branches/R-conflicts/m4/R.m4
~ /branches/R-conflicts/Makeconf.in
~ /branches/R-conflicts/Makefile.in
~ /branches/R-conflicts/share/texmf/bibtex/bib/RJournal.bib
~ /branches/R-conflicts/src/appl/lbfgsb.c
~ /branches/R-conflicts/src/appl/Makefile.in
~ /branches/R-conflicts/src/extra/tzone/Make.zi
~ /branches/R-conflicts/src/extra/tzone/Notes
~ /branches/R-conflicts/src/extra/tzone/zoneinfo.zip
~ /branches/R-conflicts/src/gnuwin32/cran/index.in
~ /branches/R-conflicts/src/gnuwin32/cran/Makefile
~ /branches/R-conflicts/src/gnuwin32/cran/rdevel.in
~ /branches/R-conflicts/src/gnuwin32/cran/rpatched.in
~ /branches/R-conflicts/src/gnuwin32/cran/rtest.in
~ /branches/R-conflicts/src/gnuwin32/extra.c
~ /branches/R-conflicts/src/gnuwin32/fixed/etc/Makeconf
~ /branches/R-conflicts/src/gnuwin32/fixed/h/config.h
~ /branches/R-conflicts/src/gnuwin32/front-ends/rcmdfn.c
~ /branches/R-conflicts/src/gnuwin32/MkRules.rules
~ /branches/R-conflicts/src/gnuwin32/Rdll.hide
~ /branches/R-conflicts/src/gnuwin32/run.c
~ /branches/R-conflicts/src/gnuwin32/run.h
~ /branches/R-conflicts/src/gnuwin32/sys-win32.c
~ /branches/R-conflicts/src/include/config.h.in
~ /branches/R-conflicts/src/include/Defn.h
~ /branches/R-conflicts/src/include/Rconnections.h
~ /branches/R-conflicts/src/include/Rinternals.h
~ /branches/R-conflicts/src/include/Rmodules/Rinternet.h
~ /branches/R-conflicts/src/library/base/man/Bessel.Rd
~ /branches/R-conflicts/src/library/base/man/connections.Rd
~ /branches/R-conflicts/src/library/base/man/Extract.data.frame.Rd
~ /branches/R-conflicts/src/library/base/man/format.Rd
~ /branches/R-conflicts/src/library/base/man/grep.Rd
~ /branches/R-conflicts/src/library/base/man/list.files.Rd
~ /branches/R-conflicts/src/library/base/man/LongVectors.Rd
~ /branches/R-conflicts/src/library/base/man/nchar.Rd
~ /branches/R-conflicts/src/library/base/man/rep.Rd
~ /branches/R-conflicts/src/library/base/man/system.Rd
~ /branches/R-conflicts/src/library/base/man/system2.Rd
~ /branches/R-conflicts/src/library/base/man/tapply.Rd
~ /branches/R-conflicts/src/library/base/man/tempfile.Rd
~ /branches/R-conflicts/src/library/base/man/which.Rd
~ /branches/R-conflicts/src/library/base/R/connections.R
~ /branches/R-conflicts/src/library/base/R/dataframe.R
~ /branches/R-conflicts/src/library/base/R/format.R
~ /branches/R-conflicts/src/library/base/R/ifelse.R
~ /branches/R-conflicts/src/library/base/R/library.R
~ /branches/R-conflicts/src/library/base/R/message.R
~ /branches/R-conflicts/src/library/base/R/namespace.R
~ /branches/R-conflicts/src/library/base/R/seq.R
~ /branches/R-conflicts/src/library/base/R/windows/system.R
~ /branches/R-conflicts/src/library/base/R/zzz.R
~ /branches/R-conflicts/src/library/compiler/noweb/compiler.nw
~ /branches/R-conflicts/src/library/compiler/R/cmp.R
~ /branches/R-conflicts/src/library/graphics/R/identify.R
~ /branches/R-conflicts/src/library/grDevices/man/convertColor.Rd
~ /branches/R-conflicts/src/library/grDevices/man/make.rgb.Rd
~ /branches/R-conflicts/src/library/grDevices/man/plotmath.Rd
~ /branches/R-conflicts/src/library/grDevices/man/unix/savePlot.Rd
~ /branches/R-conflicts/src/library/grDevices/man/windows/savePlot.Rd
~ /branches/R-conflicts/src/library/grDevices/R/convertColor.R
~ /branches/R-conflicts/src/library/grDevices/src/cairo/Makefile.in
+ /branches/R-conflicts/src/library/grDevices/tests/convertColor-tests.R (copied from /trunk/src/library/grDevices/tests/convertColor-tests.R@76062)
~ /branches/R-conflicts/src/library/grDevices/tests/ps-tests.Rout.save
~ /branches/R-conflicts/src/library/grDevices/tests/xfig-tests.Rout.save
~ /branches/R-conflicts/src/library/grid/inst/doc/changes.txt
~ /branches/R-conflicts/src/library/grid/man/drawDetails.Rd
~ /branches/R-conflicts/src/library/grid/NAMESPACE
~ /branches/R-conflicts/src/library/grid/R/grab.R
~ /branches/R-conflicts/src/library/grid/R/unit.R
~ /branches/R-conflicts/src/library/grid/tests/testls.Rout.save
~ /branches/R-conflicts/src/library/methods/man/findMethods.Rd
~ /branches/R-conflicts/src/library/methods/man/languageEl.Rd
~ /branches/R-conflicts/src/library/methods/R/BasicFunsList.R
~ /branches/R-conflicts/src/library/methods/R/is.R
~ /branches/R-conflicts/src/library/methods/R/Methods.R
~ /branches/R-conflicts/src/library/methods/R/MethodsList.R
~ /branches/R-conflicts/src/library/methods/R/methodsTable.R
~ /branches/R-conflicts/src/library/methods/R/RClassUtils.R
~ /branches/R-conflicts/src/library/methods/R/RMethodUtils.R
~ /branches/R-conflicts/src/library/methods/R/zzz.R
~ /branches/R-conflicts/src/library/parallel/tests/multicore2.Rout.save
~ /branches/R-conflicts/src/library/parallel/tests/snow2.Rout.save
~ /branches/R-conflicts/src/library/stats/man/approxfun.Rd
~ /branches/R-conflicts/src/library/stats/man/formula.Rd
~ /branches/R-conflicts/src/library/stats/man/ls.diag.Rd
~ /branches/R-conflicts/src/library/stats/man/splinefun.Rd
~ /branches/R-conflicts/src/library/stats/NAMESPACE
~ /branches/R-conflicts/src/library/stats/R/approx.R
~ /branches/R-conflicts/src/library/stats/R/ar.R
~ /branches/R-conflicts/src/library/stats/R/lsfit.R
~ /branches/R-conflicts/src/library/stats/R/models.R
~ /branches/R-conflicts/src/library/stats/R/p.adjust.R
~ /branches/R-conflicts/src/library/stats/R/spline.R
~ /branches/R-conflicts/src/library/stats/R/splinefun.R
~ /branches/R-conflicts/src/library/stats/src/Makefile.in
~ /branches/R-conflicts/src/library/stats/src/Makefile.win
~ /branches/R-conflicts/src/library/stats/src/model.c
~ /branches/R-conflicts/src/library/stats/tests/bandwidth.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/glm.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/ks-test.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/nls.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/simulate.Rout.save
~ /branches/R-conflicts/src/library/tools/man/buildVignette.Rd
~ /branches/R-conflicts/src/library/tools/man/buildVignettes.Rd
~ /branches/R-conflicts/src/library/tools/NAMESPACE
~ /branches/R-conflicts/src/library/tools/R/build.R
~ /branches/R-conflicts/src/library/tools/R/check.R
~ /branches/R-conflicts/src/library/tools/R/dynamicHelp.R
~ /branches/R-conflicts/src/library/tools/R/index.R
~ /branches/R-conflicts/src/library/tools/R/install.R
x /branches/R-conflicts/src/library/tools/R/pdftools.R
~ /branches/R-conflicts/src/library/tools/R/QC.R
~ /branches/R-conflicts/src/library/tools/R/Rd.R
~ /branches/R-conflicts/src/library/tools/R/Rd2ex.R
~ /branches/R-conflicts/src/library/tools/R/Rd2latex.R
~ /branches/R-conflicts/src/library/tools/R/Rd2txt.R
~ /branches/R-conflicts/src/library/tools/R/RdConv2.R
~ /branches/R-conflicts/src/library/tools/R/recode.R
~ /branches/R-conflicts/src/library/tools/R/sotools.R
~ /branches/R-conflicts/src/library/tools/R/sysdata.rda
~ /branches/R-conflicts/src/library/tools/R/toHTML.R
~ /branches/R-conflicts/src/library/tools/R/urltools.R
~ /branches/R-conflicts/src/library/tools/R/utils.R
~ /branches/R-conflicts/src/library/tools/R/Vignettes.R
~ /branches/R-conflicts/src/library/utils/man/download.file.Rd
~ /branches/R-conflicts/src/library/utils/man/Sweave.Rd
~ /branches/R-conflicts/src/library/utils/man/untar.Rd
~ /branches/R-conflicts/src/library/utils/R/databrowser.R
~ /branches/R-conflicts/src/library/utils/R/help.search.R
~ /branches/R-conflicts/src/library/utils/R/packages2.R
~ /branches/R-conflicts/src/library/utils/R/unix/download.file.R
~ /branches/R-conflicts/src/library/utils/R/windows/download.file.R
~ /branches/R-conflicts/src/library/utils/R/zzz.R
~ /branches/R-conflicts/src/library/utils/src/init.c
~ /branches/R-conflicts/src/library/utils/src/stubs.c
+ /branches/R-conflicts/src/library/utils/tests/download.file.R (copied from /trunk/src/library/utils/tests/download.file.R@76062)
~ /branches/R-conflicts/src/main/character.c
~ /branches/R-conflicts/src/main/connections.c
~ /branches/R-conflicts/src/main/context.c
~ /branches/R-conflicts/src/main/deparse.c
~ /branches/R-conflicts/src/main/duplicate.c
~ /branches/R-conflicts/src/main/envir.c
~ /branches/R-conflicts/src/main/eval.c
~ /branches/R-conflicts/src/main/gram.c
~ /branches/R-conflicts/src/main/gram.y
~ /branches/R-conflicts/src/main/grep.c
~ /branches/R-conflicts/src/main/internet.c
~ /branches/R-conflicts/src/main/main.c
~ /branches/R-conflicts/src/main/Makefile.in
~ /branches/R-conflicts/src/main/memory.c
~ /branches/R-conflicts/src/main/names.c
~ /branches/R-conflicts/src/main/platform.c
~ /branches/R-conflicts/src/main/Rcomplex.h
~ /branches/R-conflicts/src/main/Rdynload.c
~ /branches/R-conflicts/src/main/summary.c
~ /branches/R-conflicts/src/main/util.c
~ /branches/R-conflicts/src/modules/internet/internet.c
~ /branches/R-conflicts/src/modules/internet/libcurl.c
~ /branches/R-conflicts/src/modules/lapack/Makefile.in
~ /branches/R-conflicts/src/modules/lapack/vecLibg95c.c
~ /branches/R-conflicts/src/modules/X11/devX11.c
~ /branches/R-conflicts/src/nmath/gamma.c
~ /branches/R-conflicts/src/nmath/lgamma.c
~ /branches/R-conflicts/src/scripts/config
~ /branches/R-conflicts/src/unix/dynload.c
x /branches/R-conflicts/src/unix/hpdlfcn.c
x /branches/R-conflicts/src/unix/hpdlfcn.h
~ /branches/R-conflicts/src/unix/Makefile.in
~ /branches/R-conflicts/tests/any-all.Rout.save
~ /branches/R-conflicts/tests/arith-true.Rout.save
~ /branches/R-conflicts/tests/arith.Rout.save
~ /branches/R-conflicts/tests/complex.Rout.save
~ /branches/R-conflicts/tests/d-p-q-r-tests.Rout.save
~ /branches/R-conflicts/tests/datasets.Rout.save
~ /branches/R-conflicts/tests/datetime.R
~ /branches/R-conflicts/tests/datetime.Rout.save
~ /branches/R-conflicts/tests/datetime2.Rout.save
~ /branches/R-conflicts/tests/demos.Rout.save
~ /branches/R-conflicts/tests/eval-etc-2.Rout.save
~ /branches/R-conflicts/tests/eval-etc.Rout.save
~ /branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/graphics-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grid-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/splines-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats4-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/tools-Ex.Rout.save
~ /branches/R-conflicts/tests/iec60559.Rout.save
~ /branches/R-conflicts/tests/internet.Rout.save
~ /branches/R-conflicts/tests/isas-tests.Rout.save
~ /branches/R-conflicts/tests/lapack.Rout.save
~ /branches/R-conflicts/tests/lm-tests.Rout.save
~ /branches/R-conflicts/tests/Makefile.in
~ /branches/R-conflicts/tests/Makefile.install
~ /branches/R-conflicts/tests/method-dispatch.Rout.save
~ /branches/R-conflicts/tests/ok-errors.Rout.save
~ /branches/R-conflicts/tests/p-r-random-tests.Rout.save
~ /branches/R-conflicts/tests/Pkgs/exNSS4/NAMESPACE
+ /branches/R-conflicts/tests/Pkgs/exNSS4/R/zlater.R (copied from /trunk/tests/Pkgs/exNSS4/R/zlater.R@76062)
+ /branches/R-conflicts/tests/Pkgs/exSexpr/man/a.Rd (copied from /trunk/tests/Pkgs/exSexpr/man/a.Rd@76062)
~ /branches/R-conflicts/tests/Pkgs/pkgB/DESCRIPTION
~ /branches/R-conflicts/tests/Pkgs/pkgB/NAMESPACE
+ /branches/R-conflicts/tests/Pkgs/pkgC (copied from /trunk/tests/Pkgs/pkgC@76062)
~ /branches/R-conflicts/tests/Pkgs/xDir/pkg/NAMESPACE
~ /branches/R-conflicts/tests/Pkgs/xDir/pkg/R/pkgA.R
~ /branches/R-conflicts/tests/print-tests.Rout.save
~ /branches/R-conflicts/tests/R-intro.Rout.save
~ /branches/R-conflicts/tests/reg-examples3.Rout.save
~ /branches/R-conflicts/tests/reg-IO.Rout.save
~ /branches/R-conflicts/tests/reg-IO2.Rout.save
~ /branches/R-conflicts/tests/reg-large.R
~ /branches/R-conflicts/tests/reg-packages.R
~ /branches/R-conflicts/tests/reg-S4.R
~ /branches/R-conflicts/tests/reg-S4.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1a.R
~ /branches/R-conflicts/tests/reg-tests-1d.R
~ /branches/R-conflicts/tests/reg-tests-2.Rout.save
~ /branches/R-conflicts/tests/reg-tests-3.Rout.save
~ /branches/R-conflicts/tests/simple-true.Rout.save
~ /branches/R-conflicts/tools/config.guess
~ /branches/R-conflicts/tools/config.sub

Rev 75701 – Merged changes from trunk through 75700

luke — Tue, 27 Nov 2018 23:50:05 +0000

luke – 92 file(s) modified
Merged changes from trunk through 75700

Rev 75629 – Merged changes from trunk through 75628

luke — Tue, 20 Nov 2018 16:13:17 +0000

luke – 78 file(s) modified
Merged changes from trunk through 75628

~ /branches/R-conflicts/doc/manual/R-admin.texi
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/src/include/Defn.h
~ /branches/R-conflicts/src/include/Parse.h
~ /branches/R-conflicts/src/include/Rinlinedfuns.h
~ /branches/R-conflicts/src/include/Rinternals.h
~ /branches/R-conflicts/src/library/base/man/aperm.Rd
~ /branches/R-conflicts/src/library/base/R/dataframe.R
~ /branches/R-conflicts/src/library/base/R/structure.R
~ /branches/R-conflicts/src/library/base/R/taskCallback.R
~ /branches/R-conflicts/src/library/base/R/unname.R
~ /branches/R-conflicts/src/library/grDevices/src/devPS.c
~ /branches/R-conflicts/src/library/grDevices/tests/ps-tests.Rout.save
~ /branches/R-conflicts/src/library/grDevices/tests/xfig-tests.Rout.save
~ /branches/R-conflicts/src/library/grid/tests/testls.Rout.save
~ /branches/R-conflicts/src/library/methods/R/is.R
~ /branches/R-conflicts/src/library/methods/R/methodsTable.R
~ /branches/R-conflicts/src/library/methods/R/packageName.R
~ /branches/R-conflicts/src/library/methods/R/RMethodUtils.R
~ /branches/R-conflicts/src/library/methods/R/SClasses.R
~ /branches/R-conflicts/src/library/parallel/tests/multicore2.Rout.save
~ /branches/R-conflicts/src/library/parallel/tests/snow2.Rout.save
~ /branches/R-conflicts/src/library/stats/R/add.R
~ /branches/R-conflicts/src/library/stats/tests/bandwidth.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/glm.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/ks-test.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/nls.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/simulate.Rout.save
~ /branches/R-conflicts/src/library/tools/man/Rd2HTML.Rd
~ /branches/R-conflicts/src/library/tools/R/check.R
~ /branches/R-conflicts/src/library/tools/R/Rd2latex.R
~ /branches/R-conflicts/src/library/utils/man/untar.Rd
~ /branches/R-conflicts/src/main/altclasses.c
~ /branches/R-conflicts/src/main/altrep.c
~ /branches/R-conflicts/src/main/errors.c
~ /branches/R-conflicts/src/main/eval.c
~ /branches/R-conflicts/src/main/gram.c
~ /branches/R-conflicts/src/main/gram.y
~ /branches/R-conflicts/src/main/main.c
~ /branches/R-conflicts/src/main/memory.c
~ /branches/R-conflicts/src/main/util.c
~ /branches/R-conflicts/tests/any-all.Rout.save
~ /branches/R-conflicts/tests/arith-true.Rout.save
~ /branches/R-conflicts/tests/arith.Rout.save
~ /branches/R-conflicts/tests/complex.Rout.save
~ /branches/R-conflicts/tests/d-p-q-r-tests.Rout.save
~ /branches/R-conflicts/tests/datasets.Rout.save
~ /branches/R-conflicts/tests/datetime.Rout.save
~ /branches/R-conflicts/tests/datetime2.Rout.save
~ /branches/R-conflicts/tests/demos.Rout.save
~ /branches/R-conflicts/tests/eval-etc-2.Rout.save
~ /branches/R-conflicts/tests/eval-etc.Rout.save
~ /branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/graphics-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grid-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/splines-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats4-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/tools-Ex.Rout.save
~ /branches/R-conflicts/tests/iec60559.Rout.save
~ /branches/R-conflicts/tests/internet.Rout.save
~ /branches/R-conflicts/tests/isas-tests.Rout.save
~ /branches/R-conflicts/tests/lapack.Rout.save
~ /branches/R-conflicts/tests/lm-tests.Rout.save
~ /branches/R-conflicts/tests/method-dispatch.Rout.save
~ /branches/R-conflicts/tests/ok-errors.Rout.save
~ /branches/R-conflicts/tests/p-r-random-tests.Rout.save
~ /branches/R-conflicts/tests/print-tests.Rout.save
~ /branches/R-conflicts/tests/R-intro.Rout.save
~ /branches/R-conflicts/tests/reg-examples3.Rout.save
~ /branches/R-conflicts/tests/reg-IO.Rout.save
~ /branches/R-conflicts/tests/reg-IO2.Rout.save
~ /branches/R-conflicts/tests/reg-S4.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1d.R
~ /branches/R-conflicts/tests/reg-tests-2.Rout.save
~ /branches/R-conflicts/tests/reg-tests-3.Rout.save
~ /branches/R-conflicts/tests/simple-true.Rout.save

Rev 75597 – Merged changes from trunk through 75591

luke — Tue, 13 Nov 2018 16:18:53 +0000

luke – 118 file(s) modified
Merged changes from trunk through 75591

~ /branches/R-conflicts/configure
~ /branches/R-conflicts/doc/manual/R-admin.texi
~ /branches/R-conflicts/doc/manual/R-exts.texi
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/src/extra/tre/regexec.c
~ /branches/R-conflicts/src/include/Defn.h
~ /branches/R-conflicts/src/include/Internal.h
~ /branches/R-conflicts/src/include/Parse.h
~ /branches/R-conflicts/src/include/Rinternals.h
~ /branches/R-conflicts/src/library/base/man/base-internal.Rd
~ /branches/R-conflicts/src/library/base/man/Dates.Rd
~ /branches/R-conflicts/src/library/base/man/DateTimeClasses.Rd
~ /branches/R-conflicts/src/library/base/man/dynload.Rd
~ /branches/R-conflicts/src/library/base/man/expression.Rd
~ /branches/R-conflicts/src/library/base/man/formals.Rd
~ /branches/R-conflicts/src/library/base/man/formatc.Rd
~ /branches/R-conflicts/src/library/base/man/is.function.Rd
~ /branches/R-conflicts/src/library/base/man/Random.Rd
~ /branches/R-conflicts/src/library/base/R/backquote.R
~ /branches/R-conflicts/src/library/base/R/duplicated.R
~ /branches/R-conflicts/src/library/base/R/formals.R
~ /branches/R-conflicts/src/library/base/R/format.R
~ /branches/R-conflicts/src/library/base/R/library.R
~ /branches/R-conflicts/src/library/base/R/structure.R
~ /branches/R-conflicts/src/library/base/R/unname.R
~ /branches/R-conflicts/src/library/graphics/man/boxplot.Rd
~ /branches/R-conflicts/src/library/graphics/NAMESPACE
~ /branches/R-conflicts/src/library/graphics/src/plot3d.c
~ /branches/R-conflicts/src/library/grDevices/tests/ps-tests.Rout.save
~ /branches/R-conflicts/src/library/grDevices/tests/xfig-tests.Rout.save
~ /branches/R-conflicts/src/library/grid/inst/doc/changes.txt
~ /branches/R-conflicts/src/library/grid/man/grid.grab.Rd
~ /branches/R-conflicts/src/library/grid/R/grab.R
~ /branches/R-conflicts/src/library/grid/tests/testls.Rout.save
~ /branches/R-conflicts/src/library/methods/R/addedFunctions.R
~ /branches/R-conflicts/src/library/parallel/tests/multicore2.Rout.save
~ /branches/R-conflicts/src/library/parallel/tests/snow2.Rout.save
~ /branches/R-conflicts/src/library/stats/man/ts.Rd
~ /branches/R-conflicts/src/library/stats/tests/bandwidth.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/glm.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/ks-test.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/nls.Rout.save
~ /branches/R-conflicts/src/library/stats/tests/simulate.Rout.save
~ /branches/R-conflicts/src/library/tcltk/man/tk_messageBox.Rd
~ /branches/R-conflicts/src/library/tcltk/R/utils.R
~ /branches/R-conflicts/src/library/tools/R/check.R
~ /branches/R-conflicts/src/library/tools/R/doitools.R
~ /branches/R-conflicts/src/library/tools/R/Rd2latex.R
~ /branches/R-conflicts/src/library/tools/R/Rdtools.R
+ /branches/R-conflicts/src/library/tools/tests/Rd2HTML.R (copied from /trunk/src/library/tools/tests/Rd2HTML.R@75591)
~ /branches/R-conflicts/src/library/utils/man/rcompgen.Rd
~ /branches/R-conflicts/src/library/utils/R/completion.R
~ /branches/R-conflicts/src/library/utils/R/example.R
~ /branches/R-conflicts/src/library/utils/R/str.R
~ /branches/R-conflicts/src/main/altclasses.c
~ /branches/R-conflicts/src/main/altrep.c
~ /branches/R-conflicts/src/main/apply.c
~ /branches/R-conflicts/src/main/array.c
~ /branches/R-conflicts/src/main/attrib.c
~ /branches/R-conflicts/src/main/builtin.c
~ /branches/R-conflicts/src/main/dcf.c
~ /branches/R-conflicts/src/main/dotcode.c
~ /branches/R-conflicts/src/main/duplicate.c
~ /branches/R-conflicts/src/main/envir.c
~ /branches/R-conflicts/src/main/errors.c
~ /branches/R-conflicts/src/main/eval.c
~ /branches/R-conflicts/src/main/gram.c
~ /branches/R-conflicts/src/main/gram.y
~ /branches/R-conflicts/src/main/logic.c
~ /branches/R-conflicts/src/main/main.c
~ /branches/R-conflicts/src/main/memory.c
~ /branches/R-conflicts/src/main/names.c
~ /branches/R-conflicts/src/main/objects.c
~ /branches/R-conflicts/src/main/print.c
~ /branches/R-conflicts/src/main/RNG.c
~ /branches/R-conflicts/src/main/serialize.c
~ /branches/R-conflicts/src/main/source.c
~ /branches/R-conflicts/src/main/startup.c
~ /branches/R-conflicts/src/main/subscript.c
~ /branches/R-conflicts/src/main/unique.c
~ /branches/R-conflicts/src/main/util.c
~ /branches/R-conflicts/src/modules/lapack/Lapack.c
~ /branches/R-conflicts/tests/any-all.Rout.save
~ /branches/R-conflicts/tests/arith-true.Rout.save
~ /branches/R-conflicts/tests/arith.Rout.save
~ /branches/R-conflicts/tests/complex.Rout.save
~ /branches/R-conflicts/tests/d-p-q-r-tests.Rout.save
~ /branches/R-conflicts/tests/datasets.Rout.save
~ /branches/R-conflicts/tests/datetime2.Rout.save
~ /branches/R-conflicts/tests/demos.Rout.save
~ /branches/R-conflicts/tests/eval-etc-2.Rout.save
~ /branches/R-conflicts/tests/eval-etc.Rout.save
~ /branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/graphics-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/grid-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/splines-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/stats4-Ex.Rout.save
~ /branches/R-conflicts/tests/Examples/tools-Ex.Rout.save
~ /branches/R-conflicts/tests/iec60559.Rout.save
~ /branches/R-conflicts/tests/internet.Rout.save
~ /branches/R-conflicts/tests/isas-tests.Rout.save
~ /branches/R-conflicts/tests/lapack.Rout.save
~ /branches/R-conflicts/tests/lm-tests.Rout.save
~ /branches/R-conflicts/tests/method-dispatch.Rout.save
~ /branches/R-conflicts/tests/ok-errors.Rout.save
~ /branches/R-conflicts/tests/p-r-random-tests.Rout.save
~ /branches/R-conflicts/tests/print-tests.Rout.save
~ /branches/R-conflicts/tests/R-intro.Rout.save
~ /branches/R-conflicts/tests/reg-examples3.Rout.save
~ /branches/R-conflicts/tests/reg-IO.Rout.save
~ /branches/R-conflicts/tests/reg-IO2.Rout.save
~ /branches/R-conflicts/tests/reg-S4.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1d.R
~ /branches/R-conflicts/tests/reg-tests-2.Rout.save
~ /branches/R-conflicts/tests/reg-tests-3.Rout.save
~ /branches/R-conflicts/tests/simple-true.Rout.save

Rev 75513 – Merged changes from trunk through 75511

luke — Mon, 29 Oct 2018 18:55:34 +0000

luke – 33 file(s) modified
Merged changes from trunk through 75511

~ /branches/R-conflicts/configure
~ /branches/R-conflicts/configure.ac
~ /branches/R-conflicts/doc/CRAN_mirrors.csv
~ /branches/R-conflicts/doc/manual/R-admin.texi
~ /branches/R-conflicts/doc/manual/R-exts.texi
~ /branches/R-conflicts/doc/manual/R-FAQ.texi
~ /branches/R-conflicts/doc/manual/rw-FAQ.texi
~ /branches/R-conflicts/doc/NEWS.Rd
~ /branches/R-conflicts/src/gnuwin32/extra.c
~ /branches/R-conflicts/src/include/Internal.h
~ /branches/R-conflicts/src/include/Rinlinedfuns.h
~ /branches/R-conflicts/src/include/Rinternals.h
~ /branches/R-conflicts/src/include/R_ext/Altrep.h
~ /branches/R-conflicts/src/library/base/R/dataframe.R
~ /branches/R-conflicts/src/library/base/R/dates.R
~ /branches/R-conflicts/src/library/base/R/datetime.R
~ /branches/R-conflicts/src/library/base/R/duplicated.R
~ /branches/R-conflicts/src/library/graphics/man/boxplot.Rd
~ /branches/R-conflicts/src/library/graphics/man/bxp.Rd
~ /branches/R-conflicts/src/library/graphics/R/boxplot.R
~ /branches/R-conflicts/src/library/parallel/src/fork.c
~ /branches/R-conflicts/src/library/tools/R/check.R
~ /branches/R-conflicts/src/library/utils/src/size.c
~ /branches/R-conflicts/src/main/altclasses.c
~ /branches/R-conflicts/src/main/altrep.c
~ /branches/R-conflicts/src/main/duplicate.c
~ /branches/R-conflicts/src/main/envir.c
~ /branches/R-conflicts/src/main/inspect.c
~ /branches/R-conflicts/src/main/main.c
~ /branches/R-conflicts/src/main/names.c
~ /branches/R-conflicts/src/main/objects.c
~ /branches/R-conflicts/tests/print-tests.Rout.save
~ /branches/R-conflicts/tests/reg-tests-1d.R

Rev 75453 – Create branch for experimenting with search path conflict resolution.

luke — Thu, 18 Oct 2018 16:45:09 +0000

luke – 1 file(s) modified
Create branch for experimenting with search path conflict resolution.

+ /branches/R-conflicts (copied from /trunk@75452)

Rev 75448 – stop gap for legend(*, cex=CX) w/ length(CX) > 1

maechler — Tue, 16 Oct 2018 16:13:35 +0000

maechler – 4 file(s) modified
stop gap for legend(*, cex=CX) w/ length(CX) > 1

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/graphics/man/legend.Rd
~ /trunk/src/library/graphics/R/legend.R
~ /trunk/tests/Examples/graphics-Ex.Rout.save

Rev 75438 – item was in the wrong place

ripley — Sun, 14 Oct 2018 07:22:32 +0000

ripley – 1 file(s) modified
item was in the wrong place

~ /trunk/doc/NEWS.Rd

Rev 75436 – tweaks, mainly markup and grammar

ripley — Sun, 14 Oct 2018 07:12:50 +0000

ripley – 1 file(s) modified
tweaks, mainly markup and grammar

~ /trunk/doc/NEWS.Rd

Rev 75435 – all.equal.numeric(*, scale): s. can be vector

maechler — Sat, 13 Oct 2018 19:51:49 +0000

maechler – 3 file(s) modified
all.equal.numeric(*, scale): s. can be vector

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/base/man/all.equal.Rd
~ /trunk/src/library/base/R/all.equal.R

Rev 75424 – Deferred string conversions now record the OutDec setting (reported ...

luke — Tue, 09 Oct 2018 22:01:41 +0000

luke – 4 file(s) modified
Deferred string conversions now record the OutDec setting (reported by
Michael Sannella).

~ /trunk/doc/NEWS.Rd
~ /trunk/src/include/Rinternals.h
~ /trunk/src/main/altclasses.c
~ /trunk/tests/reg-tests-1d.R

Rev 75417 – Allow unzip() to list archives with comments and with space ...

kalibera — Tue, 09 Oct 2018 14:37:25 +0000

kalibera – 2 file(s) modified
Allow unzip() to list archives with comments and with space in file names
using external unzip command (reported by Paul Schrimpf).

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/utils/R/zip.R

Rev 75412 – document r75410 (which was still under test)

ripley — Mon, 08 Oct 2018 11:20:23 +0000

ripley – 1 file(s) modified
document r75410 (which was still under test)

~ /trunk/doc/NEWS.Rd

Rev 75400 – fix cut(, k)

maechler — Fri, 05 Oct 2018 07:10:22 +0000

maechler – 3 file(s) modified
fix cut(<all 0>, k)

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/base/R/cut.R
~ /trunk/tests/reg-tests-1d.R

Rev 75390 – corrections, grammar, markup

ripley — Wed, 03 Oct 2018 06:56:07 +0000

ripley – 1 file(s) modified
corrections, grammar, markup

~ /trunk/doc/NEWS.Rd

Rev 75389 – more tweaks for \Sexpr checking, including evaluating in the top-level ...

ripley — Wed, 03 Oct 2018 05:47:44 +0000

ripley – 3 file(s) modified
more tweaks for \Sexpr checking, including evaluating in the top-level package sources

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/tools/R/QC.R
~ /trunk/src/library/tools/R/RdConv2.R

Rev 75387 – fix split() for when 'x' is an object and 'f' ...

lawrence — Tue, 02 Oct 2018 22:29:25 +0000

lawrence – 2 file(s) modified
fix split() for when 'x' is an object and 'f' is a factor with empty string

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/base/R/split.R

Rev 75386 – Include a special node in parse data for equal assignment. ...

kalibera — Tue, 02 Oct 2018 10:31:31 +0000

kalibera – 3 file(s) modified
Include a special node in parse data for equal assignment. Reported by Barbara
Lerner.

~ /trunk/doc/NEWS.Rd
~ /trunk/src/main/gram.c
~ /trunk/src/main/gram.y

Rev 75384 – missing packages now separated by "," changing .pretty_format2()`s default. ...

maechler — Tue, 02 Oct 2018 10:01:11 +0000

maechler – 1 file(s) modified
missing packages now separated by "," changing .pretty_format2()`s default. Code (in QC.R) changed already in svn rev 75378

~ /trunk/doc/NEWS.Rd

Rev 75378 – fixing \Sexpr[stage=..]{} section creation checking - PR#17479

maechler — Fri, 28 Sep 2018 15:30:10 +0000

maechler – 13 file(s) modified
fixing \Sexpr[stage=..]{} section creation checking - PR#17479

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/tools/man/Rdutils.Rd
~ /trunk/src/library/tools/R/QC.R
~ /trunk/src/library/tools/R/Rd.R
~ /trunk/src/library/tools/R/urltools.R
+ /trunk/tests/Pkgs/exSexpr
+ /trunk/tests/Pkgs/exSexpr/DESCRIPTION
+ /trunk/tests/Pkgs/exSexpr/man
+ /trunk/tests/Pkgs/exSexpr/man/foo.Rd
+ /trunk/tests/Pkgs/exSexpr/NAMESPACE
+ /trunk/tests/Pkgs/exSexpr/R
+ /trunk/tests/Pkgs/exSexpr/R/stuff.R
~ /trunk/tests/reg-packages.R

Rev 75375 – Fix for segfault in terms() (PR17480).

luke — Thu, 27 Sep 2018 14:50:36 +0000

luke – 2 file(s) modified
Fix for segfault in terms() (PR17480).

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/stats/src/model.c

Rev 75350 – sQuote() & dQuote() get explicit `q` argument

maechler — Fri, 21 Sep 2018 11:29:35 +0000

maechler – 3 file(s) modified
sQuote() & dQuote() get explicit `q` argument

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/base/man/sQuote.Rd
~ /trunk/src/library/base/R/character.R

Rev 75340 – Fixes to convertColor() for chromatic adaptation; thanks to Brodie Gaslam

murrell — Thu, 20 Sep 2018 23:24:17 +0000

murrell – 2 file(s) modified
Fixes to convertColor() for chromatic adaptation; thanks to Brodie Gaslam

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/grDevices/R/convertColor.R

Rev 75339 – fix PR 17323: download.file(*)

maechler — Thu, 20 Sep 2018 19:00:13 +0000

maechler – 3 file(s) modified
fix PR 17323: download.file(*)

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/utils/R/unix/download.file.R
~ /trunk/src/library/utils/R/windows/download.file.R

Rev 75338 – revert sample.int(, k, replace=TRUE) to sane pre_R-3.0.0 behaviour

maechler — Thu, 20 Sep 2018 15:38:46 +0000

maechler – 3 file(s) modified
revert sample.int(<non-integer>, k, replace=TRUE) to sane pre_R-3.0.0 behaviour

~ /trunk/doc/NEWS.Rd
~ /trunk/src/main/random.c
~ /trunk/tests/reg-tests-1d.R

Rev 75334 – fix / enhance influence.lm() etc for "mlm" incl Fortran, C

maechler — Thu, 20 Sep 2018 13:46:31 +0000

maechler – 11 file(s) modified
fix / enhance influence.lm() etc for "mlm" incl Fortran, C

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/stats/man/influence.measures.Rd
~ /trunk/src/library/stats/R/lm.influence.R
~ /trunk/src/library/stats/R/nafns.R
~ /trunk/src/library/stats/src/influence.c
~ /trunk/src/library/stats/src/lminfl.f
~ /trunk/src/library/stats/src/stats.h
~ /trunk/tests/lm-tests.R
~ /trunk/tests/lm-tests.Rout.save
~ /trunk/tests/reg-tests-1a.R
~ /trunk/tests/reg-tests-1d.R

Rev 75324 – .col(d) & .row(d) allow "double" d

maechler — Tue, 18 Sep 2018 20:06:25 +0000

maechler – 4 file(s) modified
.col(d) & .row(d) allow "double" d

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/base/man/col.Rd
~ /trunk/src/library/base/man/row.Rd
~ /trunk/src/main/array.c

Rev 75323 – fix a buglet in polym() (matrix accidentally turned into vector)

maechler — Tue, 18 Sep 2018 16:52:05 +0000

maechler – 3 file(s) modified
fix a buglet in polym() (matrix accidentally turned into vector)

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/stats/R/contr.poly.R
~ /trunk/tests/reg-tests-1d.R

Rev 75322 – fix cooks.distance() and rstandard() for "mlm"

maechler — Tue, 18 Sep 2018 08:32:42 +0000

maechler – 3 file(s) modified
fix cooks.distance() and rstandard() for "mlm"

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/stats/R/lm.influence.R
~ /trunk/tests/reg-tests-1d.R

Rev 75309 – disable buffering on pipe(), fifo(), and non-regular file() connections, fixes ...

lawrence — Fri, 14 Sep 2018 18:12:05 +0000

lawrence – 2 file(s) modified
disable buffering on pipe(), fifo(), and non-regular file()
connections, fixes PR #17470, reported by Chris Culnane.

~ /trunk/doc/NEWS.Rd
~ /trunk/src/main/connections.c

Rev 75305 – .check_packages(*, warningOpt = 1) as argument and use it instead ...

maechler — Fri, 14 Sep 2018 13:55:45 +0000

maechler – 2 file(s) modified
.check_packages(*, warningOpt = 1) as argument and use it instead of always `warn=1`

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/tools/R/check.R

Rev 75297 – more efficient getOption()

maechler — Thu, 13 Sep 2018 07:57:27 +0000

maechler – 2 file(s) modified
more efficient getOption()

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/base/R/options.R

Rev 75296 – update for r75290

maechler — Thu, 13 Sep 2018 07:16:40 +0000

maechler – 1 file(s) modified
update for r75290

~ /trunk/doc/NEWS.Rd

Rev 75295 – added "lines" and "chars" coordinates to grconvertX() and grconvertY()

murrell — Thu, 13 Sep 2018 01:04:01 +0000

murrell – 5 file(s) modified
added "lines" and "chars" coordinates to grconvertX() and grconvertY()

~ /trunk/doc/NEWS.Rd
~ /trunk/src/library/graphics/man/convertXY.Rd
~ /trunk/src/library/graphics/R/plot.R
~ /trunk/src/library/graphics/src/graphics.c
~ /trunk/tests/Examples/graphics-Ex.Rout.save

Rev 75289 – && and || arguments should have length one; with new ...

maechler — Wed, 12 Sep 2018 07:56:10 +0000

maechler – 6 file(s) modified
&& and || arguments should have length one; with new environment variable set, now warn or stop if length > 1

~ /trunk/doc/NEWS.Rd
~ /trunk/src/include/Rinternals.h
~ /trunk/src/main/coerce.c
~ /trunk/src/main/eval.c
~ /trunk/src/main/logic.c
~ /trunk/tests/reg-tests-1d.R