From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Thu, 12 Sep 2013 12:19:32 +0000 (+0200)
Subject: Merge branch 'libsndfile'
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/63cf293f572ae7d5c1c83b9dffb31e7d774f8854?ds=sidebyside;hp=--cc

Merge branch 'libsndfile'
---

63cf293f572ae7d5c1c83b9dffb31e7d774f8854
diff --cc interpretor/Makefile
index 89cf5a7,30a10c9..f8ea173
--- a/interpretor/Makefile
+++ b/interpretor/Makefile
@@@ -2,10 -4,9 +4,9 @@@
  #
  # The Caml sources (including camlyacc and camllex source files)
  
 -SOURCES = types.ml parser.mly lexer.mll basic.ml symbol.ml aux.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp
 +SOURCES = types.ml parser.mly lexer.mll aux.ml basic.ml symbol.ml value.ml signal.ml beam.ml process.ml faustio.ml preprocess.ml main.ml preprocess_stubs.cpp
  
  # The executable file to generate
- 
  EXEC = faustine
  
  # Path to ocaml include header files