Merge branch 'feature/new-build' into feature/hadrons

# Conflicts:
#	Makefile.am
#	scripts/copyright
This commit is contained in:
portelli committed 2016-08-03 16:49:16 +01:00
commit 2485ef9c9c
215 files changed
+8453 -4612

No files matched your search

+2 -3
View File
@@ -1,5 +1,4 @@
# additional include paths necessary to compile the C++ library
AM_CXXFLAGS = -I$(top_srcdir)/
SUBDIRS = lib tests benchmarks programs
SUBDIRS = lib benchmarks tests programs
filelist: $(SUBDIRS)
ACLOCAL_AMFLAGS = -I m4