# HG changeset patch
# User Paul LEROY <paul.leroy@lpp.polytechnique.fr>
# Date 2013-07-04 10:35:27
# Node ID c75479f183af3d2c2e70ba9393e637ef6cdc9449
# Parent  08041631eca5360a4f105fd850b08121799c70e3

commit after merge

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -7,3 +7,4 @@ syntax: glob
 *~
 *moc_*
 
+gse_lesia/lfrsgse