3 Commits

Author SHA1 Message Date
tqchen
9a6adb0f33 Merge commit '3d11f56880521c1d45504c965ae12886e9b72ace' 2015-04-08 17:39:45 -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
tqchen
e923bdb12f Merge commit '13776a006a4e572720ec4c5b029b54771cf2b35c' into unity 2015-02-11 20:33:35 -08:00