Merge branch 'release/R42withSP'

# Conflicts: # .gitignore
IARC-CSU · Oct 13, 2017 · a09b851 · a09b851
2 parents fdb586f + e136518
commit a09b851
Show file tree

Hide file tree

Showing 302 changed files with 83,511 additions and 64,291 deletions.
diff --git a/.gitignore b/.gitignore
@@ -232,15 +232,22 @@ hs_err_pid*
 /nbproject/private/
 *.lyx#
 *.tmp1
-CanReg5.zip.tmp2
+*.tmp2
+*.tmp3
+*.tmp4
+*.tmp5
+*.tmp6
+*.tmp7
 translations/
 CanReg5.zip
-CanReg5.zip.tmp3
 doc/CanReg5-Instructions.pdf
 CanReg5-R-packages.zip
-/CanReg5.zip.tmp4
+*.orig
 r-packages/*.zip
-*.tmp5
-CanReg5.zip.tmp6
-*.tmp7
+version.txt
+inno-settings.txt
 conf/tables/r/r-packages/*.zip
+.gitignore.orig
+buildnumber.properties
+out/*
+
diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml