James Harrison
90dffc73c8
Merge branch 'feature/hadrons' into feature/qed-fvol
# Conflicts:
# extras/Hadrons/Modules.hpp
# extras/Hadrons/Modules/MGauge/StochEm.cc
# extras/Hadrons/Modules/MScalar/ChargedProp.cc
# extras/Hadrons/Modules/MScalar/ChargedProp.hpp
# extras/Hadrons/modules.inc
# lib/communicator/Communicator_mpi.cc
2018-01-24 16:41:44 +00:00
..
2018-01-12 13:35:51 +00:00
2018-01-23 17:26:50 +00:00
2018-01-12 13:35:51 +00:00
2018-01-24 16:41:44 +00:00
2017-12-29 16:58:44 +01:00
2017-12-26 14:16:47 +01:00
2018-01-24 16:41:44 +00:00
2018-01-23 17:26:50 +00:00
2017-12-26 14:16:47 +01:00
2017-12-26 14:16:47 +01:00
2017-12-26 14:16:47 +01:00
2017-12-26 14:16:47 +01:00
2017-12-19 20:28:04 +00:00