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

..

Hadrons

Merge branch 'feature/hadrons' into feature/qed-fvol

2018-01-24 16:41:44 +00:00

qed-fvol

QED Gimpl moved in Photon.h

2016-12-29 22:43:38 +01:00

Makefile.am

Old qed-fvol program build disabled

2017-04-13 15:32:30 +01:00