diff options
| author | scottc <scottc> | 2002-08-16 22:48:47 +0000 |
|---|---|---|
| committer | scottc <scottc> | 2002-08-16 22:48:47 +0000 |
| commit | b77f30dc96e0d67b84a350cbcd8a4fb48913b1af (patch) | |
| tree | 43474296217651feb9adbd646c6d88c4e973191e | |
| parent | e4f85a15f0794b7b0ad05ce104b548917a1f46c0 (diff) | |
| download | gdb-b77f30dc96e0d67b84a350cbcd8a4fb48913b1af.tar.gz | |
Fix bad merge.
| -rw-r--r-- | winsup/cygwin/Makefile.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 462dc356fd9..2c0e34124f4 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -118,7 +118,6 @@ MALLOC_OFILES=@MALLOC_OFILES@ DLL_IMPORTS:=$(w32api_lib)/libkernel32.a # Please maintain this list in sorted order, with maximum files per 80 col line -<<<<<<< Makefile.in DLL_OFILES:=assert.o autoload.o cygheap.o cygserver_client.o \ cygserver_transport.o cygserver_transport_pipes.o \ |