summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:31:47 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:31:47 +0000
commit68d2f4f6cf3766f96240a9372339f3b9335a72f3 (patch)
tree7e4b775943ad6a819b25e0f10d6e5753e53f54c7
parent3b6fb2edeff78ae8326cc0ab6d5d6f32b17ff477 (diff)
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
-rw-r--r--lndir.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lndir.c b/lndir.c
index 9d06a4e..da4996d 100644
--- a/lndir.c
+++ b/lndir.c
@@ -26,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/config/util/lndir.c,v 3.18 2003/06/24 15:44:45 eich Exp $ */
+/* $XFree86: xc/config/util/lndir.c,v 3.19 2004/01/11 00:10:15 herrb Exp $ */
/* From the original /bin/sh script:
@@ -222,6 +222,8 @@ dodir (char *fn, /* name of "from" directory, either absolute or
continue;
if (!strcmp (dp->d_name, "CVS.adm"))
continue;
+ if (!strcmp (dp->d_name, ".svn"))
+ continue;
}
ocurdir = rcurdir;
rcurdir = buf;