# HG changeset patch
# User cl
# Date 1303957183 25200
# Node ID c311591c06f5dd317285127d978a184f9aff71e6
# Parent  cdf5d19ec142424489549025e9c42e51f32cf688# Parent  96dd337fc8457fdbc1cce1fd76346e8a8f8efd0f
Merge

diff -r cdf5d19ec142 -r c311591c06f5 .hgignore
--- a/.hgignore	Thu Apr 21 15:32:48 2011 -0700
+++ b/.hgignore	Wed Apr 27 19:19:43 2011 -0700
@@ -1,3 +1,4 @@
 ^build/
 ^dist/
 /nbproject/private/
+^.hgtip