# HG changeset patch
# User trims
# Date 1304121343 25200
# Node ID 6431be02f3acb4819d240c9ff17ec1343be6e3fd
# Parent  d7cc76ea8d06d8d2306e8ee2689d9cce4d159e69# Parent  df0a92a7e30bf0e7e6e368dd5d2c187c60e15534
Merge

diff -r df0a92a7e30b -r 6431be02f3ac .hgignore
--- a/.hgignore	Fri Apr 29 14:36:21 2011 -0700
+++ b/.hgignore	Fri Apr 29 16:55:43 2011 -0700
@@ -5,3 +5,4 @@
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
 ^src/share/tools/IdealGraphVisualizer/build/
 ^src/share/tools/IdealGraphVisualizer/dist/
+^.hgtip