Antonin Portelli 7587df831a Merge branch 'develop' into feature/hadrons ... # Conflicts: # lib/qcd/action/scalar/ScalarImpl.h		2017-06-20 15:50:39 +01:00
..
Hadrons	Merge branch 'develop' into feature/hadrons	2017-06-20 15:50:39 +01: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