Antonin Portelli 0503c028be Merge branch 'feature/qed-fvol' into feature/hadrons (non-trivial conflicts on scalar Impl) ... # Conflicts: # configure.ac # lib/qcd/action/scalar/Scalar.h		2017-06-05 16:37:47 -05:00
..
Scalar.h	Merge branch 'develop' into feature/hmc_generalise	2017-04-05 14:41:04 +01:00
ScalarAction.h	Adding ScalarField theory	2017-01-30 10:59:28 +00:00
ScalarImpl.h	Merge branch 'feature/qed-fvol' into feature/hadrons (non-trivial conflicts on scalar Impl)	2017-06-05 16:37:47 -05:00
ScalarInteractionAction.h	Cleanup	2017-02-09 15:18:38 +00:00