David E. O'Brien 1cdba5fa68 Fix conflicts.
Version 6.0.2s2 gives us a better fix a buffer overflow problem in
real_plog().  It also gives us a few code cleanups to quiet `gcc -Wall'.
1999-09-23 05:36:01 +00:00
..
1999-09-23 05:36:01 +00:00