Edgar Solomonik
authored
Conflicts should have already been previously resolved in memeff_redist, so no significant changes made in this merge Merge branch 'memeff_redist' Conflicts: doc/doxygen.h include/ctf.hpp src/ctr_comm/strp_tsr.cxx src/ctr_seq/sym_seq_sum_ref.hxx src/dist_tensor/cyclopstf.hpp src/dist_tensor/dist_tensor_fold.cxx src/dist_tensor/dist_tensor_map.cxx src/dist_tensor/tensor_object.cxx src/interface/ctf_term.cxx