Antonin Portelli c497864b5d Merge commit 'd54807b8c0cd1a7658ff8563bb00d1137b987e3e' into feature/scalar_adjointFT ...

# Conflicts:
#	lib/communicator/Communicator_base.h
#	lib/communicator/Communicator_mpi.cc
#	lib/communicator/Communicator_mpit.cc

2017-10-03 14:27:54 +01:00

..

Cartesian_base.h

Merge commit 'd54807b8c0cd1a7658ff8563bb00d1137b987e3e' into feature/scalar_adjointFT

2017-10-03 14:27:54 +01:00

Cartesian_full.h

Merge commit 'd54807b8c0cd1a7658ff8563bb00d1137b987e3e' into feature/scalar_adjointFT

2017-10-03 14:27:54 +01:00

Cartesian_red_black.h

Merge branch 'develop' into feature/dwf-multirhs

2017-10-02 11:41:49 +01:00

Cartesian.h

Refactoring header layout

2017-02-22 18:09:33 +00:00