Merge branch 'develop' into feature/doxygen

# Conflicts:
#	configure.ac
This commit is contained in:
2016-10-09 13:35:44 +01:00
87 changed files with 6479 additions and 2907 deletions
+4
View File
@@ -95,6 +95,10 @@ build.sh
################
lib/Eigen/*
# FFTW source #
################
lib/fftw/*
# libtool macros #
##################
m4/lt*