The R Project SVN R

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
76063 2728 d 20 h luke /branches/R-conflicts/ Merged changes from trunk through 76062  
/branches/R-conflicts/src/library/grDevices/tests/convertColor-tests.R
/branches/R-conflicts/src/library/utils/tests/download.file.R
/branches/R-conflicts/tests/Pkgs/exNSS4/R/zlater.R
/branches/R-conflicts/tests/Pkgs/exSexpr/man/a.Rd
/branches/R-conflicts/tests/Pkgs/pkgC
/branches/R-conflicts/src/library/tools/R/pdftools.R
/branches/R-conflicts/src/unix/hpdlfcn.c
/branches/R-conflicts/src/unix/hpdlfcn.h
/branches/R-conflicts/Makeconf.in
/branches/R-conflicts/Makefile.in
/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/NEWS.Rd
/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/etc/Makeconf.in
/branches/R-conflicts/m4/R.m4
/branches/R-conflicts/m4/cxx_11.m4
/branches/R-conflicts/m4/libtool.m4
/branches/R-conflicts/share/texmf/bibtex/bib/RJournal.bib
/branches/R-conflicts/src/appl/Makefile.in
/branches/R-conflicts/src/appl/lbfgsb.c
/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/MkRules.rules
/branches/R-conflicts/src/gnuwin32/Rdll.hide
/branches/R-conflicts/src/gnuwin32/cran/Makefile
/branches/R-conflicts/src/gnuwin32/cran/index.in
/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/run.c
/branches/R-conflicts/src/gnuwin32/run.h
/branches/R-conflicts/src/gnuwin32/sys-win32.c
/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/include/config.h.in
/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/base/man/Bessel.Rd
/branches/R-conflicts/src/library/base/man/Extract.data.frame.Rd
/branches/R-conflicts/src/library/base/man/LongVectors.Rd
/branches/R-conflicts/src/library/base/man/connections.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/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/compiler/R/cmp.R
/branches/R-conflicts/src/library/compiler/noweb/compiler.nw
/branches/R-conflicts/src/library/grDevices/R/convertColor.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/src/cairo/Makefile.in
/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/graphics/R/identify.R
/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/inst/doc/changes.txt
/branches/R-conflicts/src/library/grid/man/drawDetails.Rd
/branches/R-conflicts/src/library/grid/tests/testls.Rout.save
/branches/R-conflicts/src/library/methods/R/BasicFunsList.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/RClassUtils.R
/branches/R-conflicts/src/library/methods/R/RMethodUtils.R
/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/zzz.R
/branches/R-conflicts/src/library/methods/man/findMethods.Rd
/branches/R-conflicts/src/library/methods/man/languageEl.Rd
/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/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/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/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/NAMESPACE
/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/Vignettes.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/dynamicHelp.R
/branches/R-conflicts/src/library/tools/R/index.R
/branches/R-conflicts/src/library/tools/R/install.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/man/buildVignette.Rd
/branches/R-conflicts/src/library/tools/man/buildVignettes.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/man/Sweave.Rd
/branches/R-conflicts/src/library/utils/man/download.file.Rd
/branches/R-conflicts/src/library/utils/man/untar.Rd
/branches/R-conflicts/src/library/utils/src/init.c
/branches/R-conflicts/src/library/utils/src/stubs.c
/branches/R-conflicts/src/main/Makefile.in
/branches/R-conflicts/src/main/Rcomplex.h
/branches/R-conflicts/src/main/Rdynload.c
/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/memory.c
/branches/R-conflicts/src/main/names.c
/branches/R-conflicts/src/main/platform.c
/branches/R-conflicts/src/main/summary.c
/branches/R-conflicts/src/main/util.c
/branches/R-conflicts/src/modules/X11/devX11.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/nmath/gamma.c
/branches/R-conflicts/src/nmath/lgamma.c
/branches/R-conflicts/src/scripts/config
/branches/R-conflicts/src/unix/Makefile.in
/branches/R-conflicts/src/unix/dynload.c
/branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
/branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
/branches/R-conflicts/tests/Examples/graphics-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/Makefile.in
/branches/R-conflicts/tests/Makefile.install
/branches/R-conflicts/tests/Pkgs/exNSS4/NAMESPACE
/branches/R-conflicts/tests/Pkgs/pkgB/DESCRIPTION
/branches/R-conflicts/tests/Pkgs/pkgB/NAMESPACE
/branches/R-conflicts/tests/Pkgs/xDir/pkg/NAMESPACE
/branches/R-conflicts/tests/Pkgs/xDir/pkg/R/pkgA.R
/branches/R-conflicts/tests/R-intro.Rout.save
/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/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/reg-IO.Rout.save
/branches/R-conflicts/tests/reg-IO2.Rout.save
/branches/R-conflicts/tests/reg-S4.R
/branches/R-conflicts/tests/reg-S4.Rout.save
/branches/R-conflicts/tests/reg-examples3.Rout.save
/branches/R-conflicts/tests/reg-large.R
/branches/R-conflicts/tests/reg-packages.R
/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
75701 2798 d 20 h luke /branches/R-conflicts/ Merged changes from trunk through 75700  
/branches/R-conflicts/src/scripts/f77_f2c.in
/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/NEWS.Rd
/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/etc/Makeconf.in
/branches/R-conflicts/m4/R.m4
/branches/R-conflicts/src/gnuwin32/fixed/etc/Makeconf
/branches/R-conflicts/src/include/Parse.h
/branches/R-conflicts/src/include/Rinternals.h
/branches/R-conflicts/src/library/base/R/seq.R
/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/ClassExtensions.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/MethodsListClass.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/SClasses.R
/branches/R-conflicts/src/library/methods/R/as.R
/branches/R-conflicts/src/library/methods/R/methodsTable.R
/branches/R-conflicts/src/library/methods/R/promptClass.R
/branches/R-conflicts/src/library/methods/man/RClassUtils.Rd
/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/src/Makefile.in
/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/sotools.R
/branches/R-conflicts/src/library/tools/R/utils.R
/branches/R-conflicts/src/library/tools/src/gramLatex.c
/branches/R-conflicts/src/library/tools/src/gramLatex.y
/branches/R-conflicts/src/library/tools/src/gramRd.c
/branches/R-conflicts/src/library/tools/src/gramRd.y
/branches/R-conflicts/src/library/utils/R/str.R
/branches/R-conflicts/src/library/utils/man/COMPILE.Rd
/branches/R-conflicts/src/main/gram.c
/branches/R-conflicts/src/main/gram.y
/branches/R-conflicts/src/main/memory.c
/branches/R-conflicts/src/main/objects.c
/branches/R-conflicts/src/main/seq.c
/branches/R-conflicts/src/scripts/COMPILE
/branches/R-conflicts/src/scripts/LINK
/branches/R-conflicts/src/scripts/Makefile.in
/branches/R-conflicts/src/scripts/config
/branches/R-conflicts/tests/Examples/datasets-Ex.Rout.save
/branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
/branches/R-conflicts/tests/Examples/graphics-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/R-intro.Rout.save
/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/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/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-examples3.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
75629 2806 d 3 h luke /branches/R-conflicts/ Merged changes from trunk through 75628  
/branches/R-conflicts/doc/NEWS.Rd
/branches/R-conflicts/doc/manual/R-admin.texi
/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/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/base/man/aperm.Rd
/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/RMethodUtils.R
/branches/R-conflicts/src/library/methods/R/SClasses.R
/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/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/R/Rd2latex.R
/branches/R-conflicts/src/library/tools/R/check.R
/branches/R-conflicts/src/library/tools/man/Rd2HTML.Rd
/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/Examples/datasets-Ex.Rout.save
/branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
/branches/R-conflicts/tests/Examples/graphics-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/R-intro.Rout.save
/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/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/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-examples3.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
75597 2813 d 3 h luke /branches/R-conflicts/ Merged changes from trunk through 75591  
/branches/R-conflicts/src/library/tools/tests/Rd2HTML.R
/branches/R-conflicts/configure
/branches/R-conflicts/doc/NEWS.Rd
/branches/R-conflicts/doc/manual/R-admin.texi
/branches/R-conflicts/doc/manual/R-exts.texi
/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/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/base/man/DateTimeClasses.Rd
/branches/R-conflicts/src/library/base/man/Dates.Rd
/branches/R-conflicts/src/library/base/man/Random.Rd
/branches/R-conflicts/src/library/base/man/base-internal.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/grDevices/tests/ps-tests.Rout.save
/branches/R-conflicts/src/library/grDevices/tests/xfig-tests.Rout.save
/branches/R-conflicts/src/library/graphics/NAMESPACE
/branches/R-conflicts/src/library/graphics/man/boxplot.Rd
/branches/R-conflicts/src/library/graphics/src/plot3d.c
/branches/R-conflicts/src/library/grid/R/grab.R
/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/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/R/utils.R
/branches/R-conflicts/src/library/tcltk/man/tk_messageBox.Rd
/branches/R-conflicts/src/library/tools/R/Rd2latex.R
/branches/R-conflicts/src/library/tools/R/Rdtools.R
/branches/R-conflicts/src/library/tools/R/check.R
/branches/R-conflicts/src/library/tools/R/doitools.R
/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/library/utils/man/rcompgen.Rd
/branches/R-conflicts/src/main/RNG.c
/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/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/Examples/datasets-Ex.Rout.save
/branches/R-conflicts/tests/Examples/grDevices-Ex.Rout.save
/branches/R-conflicts/tests/Examples/graphics-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/R-intro.Rout.save
/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/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/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-examples3.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
75453 2839 d 3 h luke /branches/R-conflicts/ Create branch for experimenting with search path conflict resolution.  
/branches/R-conflicts
75304 2873 d 6 h luke /trunk/src/ Fixes for the refcnt/barrier combination.  
/trunk/src/include/Rinternals.h
/trunk/src/main/memory.c
75038 2917 d 23 h luke /trunk/ Added mem.maxVSize and mem.maxNSize functions to base.  
/trunk/src/library/base/man/memlimits.Rd
/trunk/doc/NEWS.Rd
/trunk/src/include/Internal.h
/trunk/src/library/base/R/New-Internal.R
/trunk/src/main/memory.c
/trunk/src/main/names.c
74864 2971 d 22 h luke /trunk/src/ Added versions of malloc, calloc, and realloc that GC and retry after
initial failure.		  
/trunk/src/include/R_ext/Memory.h
/trunk/src/main/memory.c
74620 3020 d 7 h kalibera /trunk/src/main/ Fix printf format string specifier for R_xlen_t in error message for a
signed type.		  
/trunk/src/main/memory.c
74405 3057 d 1 h luke /trunk/ All sort veriants now make use of ALTREP meta-data; from Gabe Becker.  
/trunk/src/include/Internal.h
/trunk/src/include/R_ext/Altrep.h
/trunk/src/include/Rinternals.h
/trunk/src/library/base/R/sort.R
/trunk/src/library/base/man/base-internal.Rd
/trunk/src/main/altrep.c
/trunk/src/main/memory.c
/trunk/src/main/names.c
/trunk/src/main/sort.c
/trunk/tests/reg-tests-1d.R
74380 3061 d 1 h luke /trunk/src/ More checking of data pointer use for zero-length vectors.  
/trunk/src/include/Rinlinedfuns.h
/trunk/src/main/memory.c
74379 3061 d 2 h luke /trunk/src/main/ Don't do a zero-length check in STDVEC_DATAPTR for CHARSXP since these
always have a trailing zero byte.		  
/trunk/src/main/memory.c
74255 3084 d 2 h luke /trunk/ Finalizers are now run with interrupts suspended.  
/trunk/doc/NEWS.Rd
/trunk/src/main/memory.c
74195 3097 d 8 h luke /trunk/src/main/ Allow for y to be NULL in NODE_IS_OLDER macro.  
/trunk/src/main/memory.c
74021 3128 d 7 h luke /trunk/src/ Added RAISE_NAMED and used in place of many SET_NAMED calls.  
/trunk/src/include/Rinternals.h
/trunk/src/main/builtin.c
/trunk/src/main/coerce.c
/trunk/src/main/eval.c
/trunk/src/main/memory.c
/trunk/src/main/subassign.c
/trunk/src/main/subscript.c
/trunk/src/main/subset.c
74017 3128 d 20 h luke /trunk/src/ Added SETTER_CLEAR_NAMED and use instead of some SET_NAMED(x, 0) calls.  
/trunk/src/include/Rinternals.h
/trunk/src/main/attrib.c
/trunk/src/main/coerce.c
/trunk/src/main/eval.c
/trunk/src/main/memory.c
/trunk/src/main/subassign.c
74015 3128 d 21 h luke /trunk/src/ Add ENSURE_NAMED and use is place of SET_NAMED(x, 1) calls.  
/trunk/src/include/Rinternals.h
/trunk/src/main/apply.c
/trunk/src/main/envir.c
/trunk/src/main/eval.c
/trunk/src/main/memory.c
/trunk/src/main/serialize.c
74014 3129 d 1 h luke /trunk/src/ Added missing function version of TRACKREFS macro for barrier checking.  
/trunk/src/include/Rinternals.h
/trunk/src/main/memory.c
73976 3132 d 5 h luke /trunk/src/main/ Added missing reference count increments.  
/trunk/src/main/memory.c
73944 3138 d 19 h luke /trunk/src/main/ Removed obsolete comment and added some missing checks.  
/trunk/src/main/memory.c

←Prev12Next→

Show All