2 Commits

Author SHA1 Message Date
tqchen
59b96cdda5 Merge commit '1e56ba86d9d3e44b14c0a8f5ff71369307dbe86c' 2015-04-27 15:58:57 -07:00
tqchen
9ccbeaa8f0 Merge commit '75bf97b57539e5572e7ae8eba72bac6562c63c07'
Conflicts:
	subtree/rabit/rabit-learn/io/line_split-inl.h
	subtree/rabit/yarn/build.sh
2015-03-21 00:48:34 -07:00