Merge branch 'master' into dks

2016-04-11 12:23:31 +02:00
parent 1e0e19180f 2339ee9b80
commit 7dc9158a09
14 changed files with 490 additions and 3 deletions
--- a/configure.ac
+++ b/configure.ac
@ -1330,6 +1330,7 @@ AC_CONFIG_FILES([Makefile \
                 src/external/libSpinValve/classes/Makefile \
                 src/external/libPhotoMeissner/Makefile \
                 src/external/libPhotoMeissner/classes/Makefile \
+                 src/external/libGbGLF/Makefile \
                 src/external/libBNMR/Makefile \
                 src/musredit_qt5/Makefile \
                 src/musredit/Makefile \