Merge branch 'master' into root6

This commit is contained in:
2016-01-23 09:49:33 +01:00
97 changed files with 6961 additions and 4750 deletions

View File

@ -1,7 +1,7 @@
AC_REVISION([m4_esyscmd_s([git describe --always])])
AC_PREREQ(2.63)
AC_INIT([musrfit],[0.15.0],[andreas.suter@psi.ch])
AC_INIT([musrfit],[0.16.0],[andreas.suter@psi.ch])
AC_CONFIG_AUX_DIR(admin)
AC_CANONICAL_HOST
#AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}])
@ -35,7 +35,7 @@ dnl -----------------------------------------------
#release versioning
MUSR_MAJOR_VERSION=0
MUSR_MINOR_VERSION=15
MUSR_MINOR_VERSION=16
MUSR_MICRO_VERSION=0
#release versioning