Merge branch 'bruno615-paramatch'

robertzk · Jan 9, 2015 · 4a63d60 · 4a63d60
2 parents 89dbb9b + 360cf50
commit 4a63d60
Show file tree

Hide file tree

Showing 31 changed files with 701 additions and 100 deletions.
diff --git a/.RData b/.RData
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -3,3 +3,5 @@ data/.DS_Store
 ..Rcheck
 .git
 .gitignore
+^.*\.Rproj$
+^\.Rproj\.user$