imach/src/imach.c - diff

Return to imach.c CVS log

Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.145 and 1.146

version 1.145, 2014/06/10 21:23:15	version 1.146, 2014/06/16 10:20:28
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	Revision 1.146 2014/06/16 10:20:28 brouard
	Summary: Merge
	Author: Brouard

	Merge, before building revised version.

Revision 1.145 2014/06/10 21:23:15 brouard	Revision 1.145 2014/06/10 21:23:15 brouard
Summary: Debugging with valgrind	Summary: Debugging with valgrind
Author: Nicolas Brouard	Author: Nicolas Brouard
Line 477 extern int errno;	Line 483 extern int errno;
#define ODIRSEPARATOR '/'	#define ODIRSEPARATOR '/'
#endif	#endif

	<<<<<<< imach.c
	/* $Id$ */
	=======
/* $Id$ */	/* $Id$ */
	>>>>>>> 1.145
/* $State$ */	/* $State$ */

	<<<<<<< imach.c
	char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
	char fullversion[]="$Revision$ $Date$";
	=======
char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";	char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
char fullversion[]="$Revision$ $Date$";	char fullversion[]="$Revision$ $Date$";
	>>>>>>> 1.145
char strstart[80];	char strstart[80];
char optionfilext[10], optionfilefiname[FILENAMELENGTH];	char optionfilext[10], optionfilefiname[FILENAMELENGTH];
int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */	int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.145
changed lines
	Added in v.1.146