portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-19 08:17:05 +01:00
Code Releases Activity

Merge branch 'feature/qed-fvol' of https://github.com/paboyle/Grid into feature/qed-fvol

Browse Source 
# Conflicts:
#	extras/Hadrons/Modules.hpp
#	extras/Hadrons/modules.inc
This commit is contained in:
James Harrison
2017-06-07 16:59:47 +01:00
parent 009f48a904 f6aa82b7f2
commit c2b2b71c5d
265 changed files with 30461 additions and 7193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extras/Hadrons/Modules/MScalar/ChargedProp.hpp
View File

@ -1,5 +1,5 @@
#ifndef Hadrons_ChargedProp_hpp_
#define Hadrons_ChargedProp_hpp_
#ifndef Hadrons_MScalar_ChargedProp_hpp_
#define Hadrons_MScalar_ChargedProp_hpp_
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
@ -59,4 +59,4 @@ END_MODULE_NAMESPACE
END_HADRONS_NAMESPACE
#endif // Hadrons_ChargedProp_hpp_
#endif // Hadrons_MScalar_ChargedProp_hpp_