Merge branch 'develop' into feature/hadrons

This commit is contained in:
portelli committed 2017-04-03 18:56:21 +01:00
commit ff4e54ef80
202 files changed
+26985 -2911

No files matched your search

+1 -1
View File
@@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#include <Grid/Grid.h>
#include <Grid/GridCore.h>
using namespace Grid;
using namespace std;
+1 -1
View File
@@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#include <Grid/Grid.h>
#include <Grid/GridCore.h>
using namespace Grid;
using namespace std;
+1 -1
View File
@@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#include <Grid/Grid.h>
#include <Grid/GridCore.h>
using namespace Grid;
using namespace std;