.hgignore
changeset 89 b6a115568b52
parent 70 a1476fa4c75b
child 100 db42ef1faa7a
--- a/.hgignore	Wed Aug 29 11:29:14 2012 +0200
+++ b/.hgignore	Sun Sep 09 15:11:32 2012 +0200
@@ -90,12 +90,14 @@
 front_idill/src/pictos/help/img bak/*
 front_idill/src/config_kinect.json
 front_idill/src/config_souris.json
+front_idill/src/mosaic/js/mosaic.js.orig
+.hgtags.orig
 syntax: regexp
 middleware/extern/.*/(bin|obj)
 middleware/src/bin/Debug/*
 middleware/src/bin/Release/*.dll
 front_idill/extern/fajran-npTuioClient/_UpgradeReport_Files/*
-^sbin/sync/config\.py$
-^virtualenv/sync/env/.*$
-syntax: regexp
-^virtualenv/sync/project-boot\.py$
\ No newline at end of file
+^sbin/sync/config\.py$
+^virtualenv/sync/env/.*$
+syntax: regexp
+^virtualenv/sync/project-boot\.py$