[PHPDOC] cvs: phpdoc / genfunclist genfuncsummary /de Translators From: Hartmut Holzgraefe (hartmut <email protected>)
Date: 06/27/00

hholzgra Mon Jun 26 22:32:53 2000 EDT

  Modified files:
    /phpdoc genfunclist genfuncsummary
    /phpdoc/de Translators
  Log:
  theese files contained unresolved conflicts that are now fixed
  they got into the big funcprototype patch by mistake
  
  
Index: phpdoc/genfunclist
diff -u phpdoc/genfunclist:1.5 phpdoc/genfunclist:1.6
--- phpdoc/genfunclist:1.5 Sat Jun 24 00:38:42 2000
+++ phpdoc/genfunclist Mon Jun 26 22:32:52 2000
@@ -28,20 +28,14 @@
 # | Rasmus Lerdorf <rasmus <email protected>> |
 # +----------------------------------------------------------------------+
 #
-# $Id: genfunclist,v 1.5 2000/06/24 07:38:42 hholzgra Exp $
+# $Id: genfunclist,v 1.6 2000/06/27 05:32:52 hholzgra Exp $
 
 for i in `find $1 -name "*.[c]" -print -o -name "*.ec" -print | xargs egrep -li function_entry` ; do
  echo $i | sed -e 's/\.\.\//# /'
  awk -f funcparse.awk < $i | sort
 done
-<<<<<<< genfunclist
 if test -f $1/language-scanner.lex # only in PHP3 sources
 then
  echo $1/language-scanner.lex | sed -e 's/\.\.\//# /'
  awk -f funcparse.awk < $1/language-scanner.lex | sort
 fi
-=======
-if test -f $1/language-scanner.lex ; then
- awk -f funcparse.awk < $1/language-scanner.lex | sort
-fi
->>>>>>> 1.4
Index: phpdoc/genfuncsummary
diff -u phpdoc/genfuncsummary:1.4 phpdoc/genfuncsummary:1.5
--- phpdoc/genfuncsummary:1.4 Sat Jun 24 00:38:42 2000
+++ phpdoc/genfuncsummary Mon Jun 26 22:32:52 2000
@@ -1,16 +1,11 @@
 #!/bin/sh
-# $Id: genfuncsummary,v 1.4 2000/06/24 07:38:42 hholzgra Exp $
+# $Id: genfuncsummary,v 1.5 2000/06/27 05:32:52 hholzgra Exp $
 
 for i in `find $1 -name "*.[ch]" -print -o -name "*.ec" -print | xargs egrep -li "{{{ proto" ` ; do
  echo $i | sed -e 's/\.\.\//# /'
  awk -f funcsummary.awk < $i | sort +1 | awk -F "---" '{ print $1; print $2; }' | sed 's/^[[:space:]]+//'
 done
-<<<<<<< genfuncsummary
 if test -f $1/language-scanner.lex # only in PHP3
 then
   awk -f funcsummary.awk < $1/language-scanner.lex | sort +1 | awk -F "---" '{ print $1; print $2; }'
-fi=======
-if test -f $1/language-scanner.lex ; then
- awk -f funcsummary.awk < $1/language-scanner.lex | sort +1 | awk -F "---" '{ print $1; print $2; }'
-fi
->>>>>>> 1.3
+fi
\ No newline at end of file
Index: phpdoc/de/Translators
diff -u phpdoc/de/Translators:1.87 phpdoc/de/Translators:1.88
--- phpdoc/de/Translators:1.87 Sat Jun 24 00:38:42 2000
+++ phpdoc/de/Translators Mon Jun 26 22:32:53 2000
@@ -81,13 +81,8 @@
 mssql.xml
 mysql.xml Uwe Steinmann fertig
 network.xml Thomas Schuermann fertig
-<<<<<<< Translators
-nis.xml
-oci8.xml
-=======
 nis,xml
 oci8.xml Thomas Fromm in Arbeit
->>>>>>> 1.79
 oracle.xml
 pcre.xml Ralf Ebert in Arbeit
 pdf.xml Uwe Steinmann fertig
@@ -95,17 +90,8 @@
 posix.xml
 recode.xml
 regex.xml
-<<<<<<< Translators
-sem.xml
-session.xml Hartmut Holzgraefe in Arbeit
-=======
 sem.xml Hartmut Holzgraefe fertig
-<<<<<<< Translators
-session.xml
->>>>>>> 1.79
-=======
 session.xml Martin Samesch in Arbeit
->>>>>>> 1.80
 snmp.xml
 strings.xml Thomas Schuermann fertig
 swf.xml Wolfgang Drews in Arbeit