Merge remote-tracking branch 'origin/unity'

Conflicts:
	R-package/src/Makevars
	R-package/src/Makevars.win
	src/utils/io.h
	wrapper/xgboost.py
This commit is contained in:
tqchen
2014-09-02 11:22:47 -07:00
14 changed files with 1535 additions and 68 deletions

2
.gitignore vendored
View File

@@ -2,7 +2,7 @@
*.slo
*.lo
*.o
*.page
# Compiled Dynamic libraries
*.so
*.dylib