changeset 215:26610bb80151

Merge
author asaha
date Wed, 04 May 2011 12:00:14 -0700
parents 581dab3f0773 (current diff) 6cdf9c2f62ba (diff)
children c6ff860428c7
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Apr 21 16:15:50 2011 -0700
+++ b/.hgignore	Wed May 04 12:00:14 2011 -0700
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip