diff options
| author | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-08-17 02:48:47 +0400 |
|---|---|---|
| committer | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-08-17 02:48:47 +0400 |
| commit | c7f4bbda99cdba696d30b510530af90d9434ea2d (patch) | |
| tree | 58a7eaf773e8afc05cc4b44498d9acdbc4257fa1 | |
| parent | e4089aa6febeaee7458138da6c40d4b3bb09af80 (diff) | |
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 462dc356f..2c0e34124 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 \ |