From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Fri, 6 Aug 1993 07:25:02 +0000 (+0000)
Subject: * ser-go32.c: Define job_control variable.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e917bef39f7a4f53d909f7e5db298c2d5634bd2d;p=binutils-gdb.git

* ser-go32.c: Define job_control variable.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6d82c0fffc4..6d3af492397 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,14 +1,12 @@
-<<<<<<< ChangeLog
 Thu Aug  5 08:58:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* ser-go32.c: Define job_control variable.
-=======
+
 Thu Aug  5 15:56:13 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
 
 	* configure.in: z8k-coff is the same as z8k-sim
 
 Thu Aug  5 08:58:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
->>>>>>> 1.1606
 
 	* 29k-share/udi/udip2soc.c: Include sys/types.h before sys/file.h.