From: Karim Barkati <karimbarkati@gmail.com>
Date: Tue, 17 Sep 2013 14:40:41 +0000 (+0200)
Subject: Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
X-Git-Url: https://svn.cri.ensmp.fr/git/Faustine.git/commitdiff_plain/509aeb980ddb8825bfbbb59f060bbca48918fac8?hp=13f27ae45e641f43a9f7cd2cc6ceef016737ad13

Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

Conflicts:
	INSTALL.txt
---

diff --git a/INSTALL.txt b/INSTALL.txt
index 88ee6e0..ebfb17d 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -5,8 +5,9 @@ Installing Faustine on a Unix machine
 PREREQUISITES
 -------------
 
-* OCaml is needed (tested version: 4.00.1).
+* OCaml is needed (tested versions: 3.12.1, 4.00.1).
 * The GNU C compiler gcc is recommended.
+* Standard development utilities are required, such as `make' (install XCode command line tools on Mac OS).
 
 
 INSTALLATION INSTRUCTIONS
@@ -29,7 +30,7 @@ This phase is fairly verbose; consider redirecting the output to a file:
 
         make > makelog.txt
 
-3- From the Faustine directory, do:
+3- From within the Faustine directory, do:
 
         sudo make install
 
diff --git a/README.txt b/README.txt
index b55749e..5441db1 100644
--- a/README.txt
+++ b/README.txt
@@ -25,11 +25,11 @@ Yann Orlarey, 2009:
 CONTENTS
 --------
 
-  architecture/         library files in Faustine (fft.lib, morpho.libÉ)
+  architecture/         library files in Faustine (fft.lib, morpho.lib...)
   benchmarks/           benchmark result files
   Changes.txt           what's new with each release
   configure             compilation configuration script
-  examples/             vector examples (fft, image processingÉ)
+  examples/             vector examples (fft, image processing...)
   INSTALL.txt           Faustine installation instructions
   interpreter/          Faustine's interpreter source code
   LICENSE.txt           license and copyright notice