Merge branch 'master' of ssh://github.com/tqchen/xgboost

Conflicts: .gitignore
2015-01-26 10:28:20 -08:00
parent c34367b207 97e058dbd7
commit 1f6b8eb344
175 changed files with 15232 additions and 425 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 *.slo
 *.lo
 *.o
-
+*.page
 # Compiled Dynamic libraries
 *.so
 *.dylib
@@ -45,5 +45,13 @@ Debug
 *save
 *csv
 .Rproj.user
+*.cpage.col
+*.cpage
 xgboost
+xgboost.mpi
 xgboost.mock
+train*
+rabit
+.Rbuildignore
+R-package.Rproj
+