Merge branch 'release/v0.6.0' into feature/hadrons

# Conflicts:
#	Makefile.am
This commit is contained in:
portelli committed 2016-11-08 20:43:39 +00:00
commit 13a8997789
140 files changed
+10370 -5042

No files matched your search

+6
View File
@@ -1,4 +1,10 @@
# additional include paths necessary to compile the C++ library
SUBDIRS = lib benchmarks tests programs
.PHONY: tests
tests: all
$(MAKE) -C tests tests
AM_CXXFLAGS += -I$(top_builddir)/include
ACLOCAL_AMFLAGS = -I m4