aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2015-05-15 13:55:19 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2015-05-15 13:55:19 +0200
commit6c65cba39dbca98caf3f8e69552b3454ec1721fc (patch)
tree00252649aeccfdd13e723054c22203006cab10c6 /.gitignore
parenta26b44d15c11ebb41083fc2efab0cc91a027b55b (diff)
parent89cd81cf47c9f05831e854d5185b5cc599745db4 (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 '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 956fa374..d76ec9eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,6 @@ vignettes/.build.timestamp
vignettes/mkin.tex
vignettes/FOCUS_Z.tex
vignettes/*cache/
+=======
+vignettes/compiled_models_cache
mkin.Rcheck

Contact - Imprint