Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / copyrite.c

diff --git a/src/gromacs/gmxlib/copyrite.c b/src/gromacs/gmxlib/copyrite.c
index 4915f238536998063d08d705ba720999aa06617f..14529515449ece8ad0f5a5f8debcea46296d3f53 100644 (file)
--- a/src/gromacs/gmxlib/copyrite.c
+++ b/src/gromacs/gmxlib/copyrite.c
@@ -275,7 +275,7 @@ void CopyRight(FILE *out, const char *szProgram)
 #define NCR (int)asize(CopyrightText)
 /* TODO: Is this exception still needed? */
 #ifdef GMX_FAHCORE
-#define NLICENSE 0 /*FAH has an exception permission from GPL to allow digital signatures in Gromacs*/
+#define NLICENSE 0 /*FAH has an exception permission from LGPL to allow digital signatures in Gromacs*/
 #else
 #define NLICENSE (int)asize(LicenseText)
 #endif
@@ -780,7 +780,7 @@ void gmx_print_version_info(FILE *fp)
     }
 #ifdef HAVE_LIBMKL
     /* MKL might be used for LAPACK/BLAS even if FFTs use FFTW, so keep it separate */
-    fprintf(fp, "Linked with Intel MKL version %s.%s.%s.\n",
+    fprintf(fp, "Linked with Intel MKL version %d.%d.%d.\n",
             __INTEL_MKL__, __INTEL_MKL_MINOR__, __INTEL_MKL_UPDATE__);
 #endif
 #ifdef GMX_GPU