From 4879254531c753527f4ae3bcf7e625fa71ca3902 Mon Sep 17 00:00:00 2001
From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Mon, 28 Feb 1994 06:06:05 +0000
Subject: 	* i387-tdep.c, i386-tdep.c i386v-nat.c, i386aix-nat.c, 
 i386m3-nat.c, config/m68k/tm-m68k.h, i960-tdep.c 	config/i960/tm-i960.h,
 remote-nindy.c, config/m88k/tm-m88k.h, 	m88k-tdep.c: Use floatformat.h
 instead of ieee-float.h. 	* sparc-tdep.c: Remove now-obsolete
 ieee-float.h stuff 	* findvar.c: Update comment regarding ieee-float.h.

---
 gdb/i386-tdep.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'gdb/i386-tdep.c')

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 4b2471f..3ddb2ff 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -22,12 +22,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "inferior.h"
 #include "gdbcore.h"
 #include "target.h"
-<<<<<<< i386-tdep.c
 #include "floatformat.h"
-||||||| 1.26
-=======
 #include "symtab.h"
->>>>>>> 1.27
 
 static long
 i386_get_frame_setup PARAMS ((int));
-- 
cgit v1.1