changeset 268:02a683859a8a

Merge
author cl
date Wed, 27 Apr 2011 19:20:45 -0700
parents c8136fd161c8 9f7c281af543
children e1b5ef243445 5598bd5ede94
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Apr 21 15:33:03 2011 -0700
+++ b/.hgignore	Wed Apr 27 19:20:45 2011 -0700
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip