Merge release-4-6 into master

[alexxy/gromacs.git] / src / programs / mdrun / mdrun.c

diff --git a/src/programs/mdrun/mdrun.c b/src/programs/mdrun/mdrun.c
index dc49b996170b2b9750d842200bd85ac70b2a5be7..0f24b8878afad8c850ab0414b749efe2a8f1fbfb 100644 (file)
--- a/src/programs/mdrun/mdrun.c
+++ b/src/programs/mdrun/mdrun.c
@@ -56,7 +56,7 @@
 /* afm stuf */
 #include "pull.h"
 
-int main(int argc,char *argv[])
+int cmain(int argc,char *argv[])
 {
   const char *desc[] = {
  #ifdef GMX_OPENMM