# HG changeset patch
# User mikejwre
# Date 1261035535 28800
# Node ID ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c
# Parent  80161484b6b1ea3985b804d3a548bcb4e815fe50# Parent  ea77a8b9b0283b7d99fc3ddca30b2d442f426469
Merge

diff -r 80161484b6b1 -r ab4ae8f45146 .hgignore
--- a/.hgignore	Tue Dec 08 09:14:58 2009 -0800
+++ b/.hgignore	Wed Dec 16 23:38:55 2009 -0800
@@ -1,3 +1,3 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/