diff .hgignore @ 422:2af4b5b0bf83

Merge from branch "ignore"
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Wed, 22 Jun 2011 13:01:50 +0100
parents 653e9694a694
children d4da9c0809ac
line wrap: on
line diff
--- a/.hgignore	Mon Jun 13 16:56:01 2011 +0100
+++ b/.hgignore	Wed Jun 22 13:01:50 2011 +0100
@@ -20,3 +20,6 @@
 *.app/*
 .DS_Store
 *.pdb
+
+re:^EasyMercurial
+re:^kdiff3