merge commit
authorStuart Parmenter <pavlov@pavlov.net>
Sun, 20 Apr 2008 04:31:15 -0700
changeset 16896 f8970ec5950647cf1e23f46d76929b76cd926380
parent 16895 9294bb61588612bfa15985f425a90d4c9bf475b7 (diff)
parent 16893 0e4eb7adb45ab7440d42ef19d39b6ce6ab8406c8 (current diff)
child 16897 c084dd0a583df49ca7e4a5ac38f4c4b236d8cf03
push idunknown
push userunknown
push dateunknown
milestone2.0a1pre
merge commit
--- a/.hgignore
+++ b/.hgignore
@@ -16,14 +16,14 @@
 ^nsprpub/
 ^dbm/
 ^security/nss/
 ^security/coreconf/
 ^security/dbm/
 
 # Build directories
 ^obj-
-^objdir-
+^objdir
 
 # Build directories for js shell
 _DBG\.OBJ/
 _OPT\.OBJ/
 
old mode 100755
new mode 100644
old mode 100755
new mode 100644