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 2730 d 12 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
75453 2840 d 19 h luke /branches/R-conflicts/ Create branch for experimenting with search path conflict resolution.  
/branches/R-conflicts
70374 3777 d 20 h murdoch /trunk/ Add COMPILED_BY config variable (to replace temporary R_COMPILED_BY environment variable).  
/trunk/doc/NEWS.Rd
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/Makefile
/trunk/src/gnuwin32/fixed/etc/Makeconf
/trunk/src/scripts/config
70363 3780 d 17 h murdoch /trunk/ Default R-devel to new toolchain  
/trunk/doc/NEWS.Rd
/trunk/doc/manual/R-admin.texi
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/cran/rdevel.in
70358 3781 d 19 h murdoch /trunk/src/gnuwin32/ Fix for PR#16776.  
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
70266 3800 d 20 h murdoch /trunk/src/gnuwin32/ Additional filtering needed for gcc 4.9.3 (patch from Jim Hester)  
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
70157 3818 d 17 h ripley /trunk/ no longer set AWK in etc/Makeconf (long unused by R)  
/trunk/configure.ac
/trunk/doc/NEWS.Rd
/trunk/doc/manual/R-data.texi
/trunk/etc/Makeconf.in
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/etc/Makeconf
69460 3951 d 1 h ripley /trunk/src/gnuwin32/ tweaks for recent MiKTeX  
/trunk/src/gnuwin32/MkRules.rules
68007 4150 d 19 h murdoch /trunk/ Back out changes for default GCC 4.9.2 toolchain.  
/trunk/doc/NEWS.Rd
/trunk/doc/manual/R-admin.texi
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/Makefile
/trunk/src/gnuwin32/fixed/etc/Makeconf
67969 4159 d 15 h murdoch /trunk/ Update defaults for new toolchain. FIXME: RTOOLS shouldn't end up hard-coded.  
/trunk/doc/NEWS.Rd
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
67879 4174 d 10 h murdoch /trunk/src/gnuwin32/ Needed for new static lib Windows build. No longer need run-time dlls copied  
/trunk/src/gnuwin32/Makefile
/trunk/src/gnuwin32/MkRules.rules
67837 4178 d 17 h murdoch /trunk/src/ Changes for compatibility with gcc 4.9.2 Windows toolchain.  
/trunk/src/gnuwin32/fixed/h/trioremap.h
/trunk/src/extra/trio/compat.c
/trunk/src/gnuwin32/Makefile
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/Makefile
/trunk/src/gnuwin32/fixed/etc/Makeconf
/trunk/src/gnuwin32/run.c
/trunk/src/include/Makefile.win
/trunk/src/main/connections.c
/trunk/src/main/deparse.c
/trunk/src/main/eval.c
/trunk/src/main/printutils.c
/trunk/src/main/serialize.c
/trunk/src/main/sprintf.c
/trunk/src/main/util.c
67343 4220 d 22 h murdoch /trunk/ Make texinfo 5.1 a requirement to build the manuals in Windows, but default to no manuals.  
/trunk/doc/NEWS.Rd
/trunk/doc/manual/Makefile.win
/trunk/doc/manual/R-admin.texi
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
67302 4226 d 0 h ripley /trunk/ tweaks  
/trunk/doc/NEWS.Rd
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
67240 4231 d 22 h murdoch /trunk/ Changes to Windows builds-MkRules.local now optional, MkRules.dist not used, rsync-extsoft target added.  
/trunk/doc/NEWS.Rd
/trunk/doc/manual/R-admin.texi
/trunk/src/gnuwin32/Makefile
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/Makefile
/trunk/src/gnuwin32/front-ends/Makefile
66212 4391 d 20 h ripley /trunk/ a couple more instances of filtering  
/trunk/share/make/winshlib.mk
/trunk/src/gnuwin32/MkRules.rules
57924 5336 d 2 h ripley /trunk/ more Windows support for multilib  
/trunk/doc/manual/R-admin.texi
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/etc/Makeconf
57583 5379 d 14 h ripley /trunk/src/gnuwin32/ clean up  
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/etc/Makeconf
57426 5390 d 21 h ripley /trunk/src/gnuwin32/ allow paths in BINPREF  
/trunk/src/gnuwin32/Makefile
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/Makefile
57417 5391 d 16 h ripley /trunk/src/ start OpenMP support  
/trunk/src/gnuwin32/MkRules.dist
/trunk/src/gnuwin32/MkRules.rules
/trunk/src/gnuwin32/fixed/Makefile
/trunk/src/gnuwin32/fixed/etc/Makeconf
/trunk/src/library/stats/src/Makefile.win

←Prev12Next→

Show All