Merge
authorschien
Mon, 02 May 2011 09:35:52 -0700
changeset 9380 b24cc3620ee4
parent 9379 8dc66e3d9732 (current diff)
parent 9378 8b7936ba6f05 (diff)
child 9381 83be6f4f938f
Merge
--- a/corba/.hgignore	Thu Apr 28 17:44:18 2011 -0700
+++ b/corba/.hgignore	Mon May 02 09:35:52 2011 -0700
@@ -1,3 +1,4 @@
 ^build/
 ^dist/
 /nbproject/private/
+^.hgtip