Merge pull request #31 from africanmathsinitiative/master

updating my repo
IDEMSInternational · May 30, 2016 · 19498c0 · 19498c0
2 parents e67e386 + f66597a
commit 19498c0
Show file tree

Hide file tree

Showing 117 changed files with 1,156 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,6 @@ x64/
 x86/
 build/
 bld/
-[Bb]in/
 [Oo]bj/
 
 # Visual Studio 2015 cache/options directory

diff --git a/instat/instat.vbproj b/instat/instat.vbproj
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/BH_1.60.0-2.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/BH_1.60.0-2.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/CCA_1.2.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/CCA_1.2.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/CircStats_0.2-4.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/CircStats_0.2-4.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/DAAG_1.22.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/DAAG_1.22.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/DBI_0.4-1.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/DBI_0.4-1.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/Evapotranspiration_1.9.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/Evapotranspiration_1.9.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/FactoMineR_1.33.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/FactoMineR_1.33.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/GGally_1.0.1.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/GGally_1.0.1.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/GlobalOptions_0.0.10.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/GlobalOptions_0.0.10.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/Lmoments_1.2-3.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/Lmoments_1.2-3.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/MASS_7.3-45.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/MASS_7.3-45.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/MatrixModels_0.4-1.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/MatrixModels_0.4-1.zip
diff --git a/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/Matrix_1.2-6.zip b/instat/static/InstatObject/R/RPackages/bin/windows/contrib/3.3/Matrix_1.2-6.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ x64/ @@
     x86/
     build/
     bld/
-    [Bb]in/
     [Oo]bj/
     # Visual Studio 2015 cache/options directory
@@ Expand Down @@