From f5a8930c8a8255f90df04b87ab744d12e205b16f Mon Sep 17 00:00:00 2001
From: "N. Brouard" <brouard@ined.fr>
Date: Mon, 16 Jun 2014 10:33:11 +0000
Subject: [PATCH] *** empty log message ***

---
 src/Makefile |  3 ++-
 src/imach.c  | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index dd78971..ec6c216 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,8 +23,9 @@ IMACHSETUPVERSION=1
 # sortie dans Output/setup.exe
 # ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
+TESTFILE=$$HOME/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
-TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
 CC=$(GCC)
 GCC= gcc
diff --git a/src/imach.c b/src/imach.c
index b19660a..785d4ce 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,12 @@
 /* $Id$
   $State$
   $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
   Summary: Debugging with valgrind
   Author: Nicolas Brouard
@@ -477,20 +483,11 @@ extern int errno;
 #define ODIRSEPARATOR '/'
 #endif
 
-<<<<<<< imach.c
-/* $Id$ */
-=======
 /* $Id$ */
->>>>>>> 1.145
 /* $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 fullversion[]="$Revision$ $Date$"; 
->>>>>>> 1.145
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
-- 
2.43.0