Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/historical/nawk/dist fix botched merge.



details:   https://anonhg.NetBSD.org/src/rev/dfd7d4ea39f1
branches:  trunk
changeset: 757391:dfd7d4ea39f1
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Aug 27 16:49:47 2010 +0000

description:
fix botched merge.

diffstat:

 external/historical/nawk/dist/proctab.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r 9521bbb8250b -r dfd7d4ea39f1 external/historical/nawk/dist/proctab.c
--- a/external/historical/nawk/dist/proctab.c   Fri Aug 27 16:39:11 2010 +0000
+++ b/external/historical/nawk/dist/proctab.c   Fri Aug 27 16:49:47 2010 +0000
@@ -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 */



Home | Main Index | Thread Index | Old Index