1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-07 12:45:55 +01:00
James Harrison bfa3a7b3b0 Merge branch 'feature/hadrons' into feature/qed-fvol
# Conflicts:
#	extras/Hadrons/Modules.hpp
#	extras/Hadrons/Modules/MGauge/StochEm.cc
#	extras/Hadrons/modules.inc
2018-03-20 20:17:59 +00:00
..
2016-12-29 22:43:38 +01:00