From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Tue, 3 Sep 2013 08:27:22 +0000 (+0200)
Subject: Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/1cd7d4be8f3cbfc71838c176e56c73774c5ba5fa?hp=152d05a95ca7cdb29bc24bcee3c7ebb70e90aab7

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

diff --git a/.gitignore b/.gitignore
index bb12dc2..fee1830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
 interpretor/faustine
-interpretor/faust-0.9.47mr3/compiler/faust
+interpretor/preprocessor/faust-0.9.47mr3/compiler/faust
 *.[oa]
 gmon.out
-ouput_sounds/output* # default names
-/Makefile # only in the current directory, because Makefile.in is sufficient
+/Makefile
 *.svg
 *.cm[iox]
 *~
@@ -11,3 +10,4 @@ parser.ml
 lexer.ml
 *.mli
 .depend*
+examples/*/output* # default names