Nathan Hjelm 82d996fb76 coll/ml: cleanup some merge related errors ... cmr=v1.7.5:ticket=trac:4158 This commit was SVN r30366. The following Trac tickets were found above: Ticket 4158 --> https://svn.open-mpi.org/trac/ompi/ticket/4158		2014-01-22 16:48:09 +00:00
..
base	coll/ml: add support for blocking and non-blocking allreduce, reduce, and	2014-01-22 15:39:19 +00:00
basesmuma	coll/ml: cleanup some merge related errors	2014-01-22 16:48:09 +00:00
iboffload	coll/ml: add support for blocking and non-blocking allreduce, reduce, and	2014-01-22 15:39:19 +00:00
ptpcoll	coll/ml: add support for blocking and non-blocking allreduce, reduce, and	2014-01-22 15:39:19 +00:00
bcol.h	coll/ml: add support for blocking and non-blocking allreduce, reduce, and	2014-01-22 15:39:19 +00:00
Makefile.am	Fix longstanding issue with our multi-project support. Rather than using	2014-01-07 22:11:15 +00:00