changeset 11381:a4d84792338b

Merge with main
author Martin Geisler <mg@lazybytes.net>
date Fri, 18 Jun 2010 20:06:32 +0200
parents 2bb6dbf04757 (diff) e1a145eebb6a (current diff)
children 2f09b13e914d
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Jun 17 15:54:26 2010 -0500
+++ b/.hgignore	Fri Jun 18 20:06:32 2010 +0200
@@ -25,6 +25,7 @@
 MANIFEST
 patches
 mercurial/__version__.py
+mercurial.egg-info
 Output/Mercurial-*.exe
 .DS_Store
 tags