Benjamin Mako Hill 2b05964b0a Merge branch 'master' into knitr ...

# Conflicts:
#	README

2026-08-13 18:18:25 -07:00

..

knitr_rdata

hand-merged knitr material

2018-08-04 11:10:39 -07:00

resources

hand-merged knitr material

2018-08-04 11:10:39 -07:00

.gitignore

hand-merged knitr material

2018-08-04 11:10:39 -07:00

cdsc-paper.sty

cdsc-paper.sty, cdsc-memo.sty: build headings without titlesec

2026-08-13 18:15:33 -07:00

Makefile

paper_template (knitr): port to master's article + lualatex stack

2026-05-11 09:47:22 -07:00

refs.bib

added code to deal with utf8 bibliographies

2012-03-13 13:54:54 -04:00

text.Rtex

Merge branch 'master' into knitr

2026-08-13 18:18:25 -07:00