changeset 345:c311591c06f5

Merge
author cl
date Wed, 27 Apr 2011 19:19:43 -0700
parents cdf5d19ec142 96dd337fc845
children a58635cdd921 62a6a0a1a350
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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