diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-05-15 13:55:19 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-05-15 13:55:19 +0200 |
| commit | 6c65cba39dbca98caf3f8e69552b3454ec1721fc (patch) | |
| tree | 00252649aeccfdd13e723054c22203006cab10c6 /vignettes | |
| parent | a26b44d15c11ebb41083fc2efab0cc91a027b55b (diff) | |
| parent | 89cd81cf47c9f05831e854d5185b5cc599745db4 (diff) | |
Merge branch 'master' into compile_odes
Conflicts
(resolved manually, deleting code that I had
integrated into the RUnit tests for testing the
compiled version):
.gitignore
DESCRIPTION
inst/unitTests/runit.mkinerrmin.R
inst/unitTests/runit.mkinfit.R
tests/testthat/test_mkinpredict_SFO_SFO.R
vignettes/FOCUS_L.html
Diffstat (limited to 'vignettes')
| -rw-r--r-- | vignettes/FOCUS_Z.pdf | bin | 214499 -> 215014 bytes |
| -rw-r--r-- | vignettes/mkin.pdf | bin | 160335 -> 160260 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/vignettes/FOCUS_Z.pdf b/vignettes/FOCUS_Z.pdf Binary files differindex f8fd354f..3174a23a 100644 --- a/vignettes/FOCUS_Z.pdf +++ b/vignettes/FOCUS_Z.pdf diff --git a/vignettes/mkin.pdf b/vignettes/mkin.pdf Binary files differindex f83f8735..8f1e0884 100644 --- a/vignettes/mkin.pdf +++ b/vignettes/mkin.pdf |