Module Name:    src
Committed By:   christos
Date:           Fri Aug 27 16:49:48 UTC 2010

Modified Files:
        src/external/historical/nawk/dist: proctab.c

Log Message:
fix botched merge.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/historical/nawk/dist/proctab.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/historical/nawk/dist/proctab.c
diff -u src/external/historical/nawk/dist/proctab.c:1.2 src/external/historical/nawk/dist/proctab.c:1.3
--- src/external/historical/nawk/dist/proctab.c:1.2	Thu Aug 26 10:55:20 2010
+++ src/external/historical/nawk/dist/proctab.c	Fri Aug 27 12:49:47 2010
@@ -186,10 +186,10 @@
 	nullproc,	/* STRING */
 	nullproc,	/* REGEXPR */
 	awkgetline,	/* GETLINE */
-	substr,	/* SUBSTR */
-	split,	/* SPLIT */
 	gensub,	/* GENSUB */
 	jump,	/* RETURN */
+	split,	/* SPLIT */
+	substr,	/* SUBSTR */
 	whilestat,	/* WHILE */
 	cat,	/* CAT */
 	boolop,	/* NOT */

Reply via email to