From: Karim Barkati <karimbarkati@gmail.com>
Date: Mon, 16 Sep 2013 13:59:05 +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/c21be74684e409aaf08937e776c6cedce35b8fc0?hp=31089f037dce058e4bfd398bb64091522d9ba4df

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

Conflicts:
	examples/Makefile
---

diff --git a/examples/Makefile b/examples/Makefile
index b004c88..befe8b4 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -8,4 +8,4 @@ define mytarget
 endef
 
 $(foreach dir,$(DIRS),$(eval $(call mytarget,$(dir))))
-
+