Merge
authormikejwre
Wed, 16 Dec 2009 23:38:55 -0800
changeset 4313 2325bc76b570
parent 4311 faf23de5e86c (current diff)
parent 4312 8bc999bb0d48 (diff)
child 4316 4ad2b14826ea
Merge
--- 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/