[PHP-DOC] cvs: livedocs / mk_phpdoc.php

[Wez Furlong]

wez             Sat May  1 04:38:36 2004 EDT

  Modified files:              
    /livedocs   mk_phpdoc.php 
  Log:
  ignore conflicted files from cvs
  
http://cvs.php.net/diff.php/livedocs/mk_phpdoc.php?r1=1.6&r2=1.7&ty=u
Index: livedocs/mk_phpdoc.php
diff -u livedocs/mk_phpdoc.php:1.6 livedocs/mk_phpdoc.php:1.7
--- livedocs/mk_phpdoc.php:1.6  Wed Apr 28 12:23:02 2004
+++ livedocs/mk_phpdoc.php      Sat May  1 04:38:36 2004
@@ -18,7 +18,7 @@
 // | Configuration file for phpdoc build                                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: mk_phpdoc.php,v 1.6 2004/04/28 16:23:02 nlopess Exp $
+// $Id: mk_phpdoc.php,v 1.7 2004/05/01 08:38:36 wez Exp $
 
 define('MK_VERSION', true);
 define('MANUAL_TITLE', 'PHP Manual');
@@ -36,7 +36,7 @@
        readdir($d); readdir($d);
 
        while (($f = readdir($d))) {
-               if (($f == 'functions.xml' && $section != 'language') || $f == 'CVS' 
|| $f == '.cvsignore') {
+               if (($f == 'functions.xml' && $section != 'language') || $f == 'CVS' 
|| $f == '.cvsignore' || !strncmp('.#', $f)) {
                        continue;
                }
                switch (filetype($path . '/' .  $f)) {