Merge branch 'master' into root6

2016-03-15 09:52:07 +01:00
parent 2afdf14c15 e0e4a1e17e
commit b1ba14ec76
11 changed files with 620 additions and 48 deletions
--- a/configure.ac
+++ b/configure.ac
@ -1242,6 +1242,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 \