diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-18 09:58:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-18 09:58:18 +0000 |
| commit | 5f35d2cf1fb22454d89f2a2874413dfb23e2fe66 (patch) | |
| tree | 2c4385a4c34467f8de684f3f26bee227137b7834 /solenv/inc/wnt.mk | |
| parent | 49c78b42d9269a6ee5eeee91e7f64b6a20a4f3f8 (diff) | |
#100000# merge problem fix
Diffstat (limited to 'solenv/inc/wnt.mk')
| -rw-r--r-- | solenv/inc/wnt.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index 77ca51dbb4f3..d3ad58cd7ad0 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -2,9 +2,9 @@ # # $RCSfile: wnt.mk,v $ # -# $Revision: 1.59 $ +# $Revision: 1.60 $ # -# last change: $Author: vg $ $Date: 2003-12-17 18:12:04 $ +# last change: $Author: vg $ $Date: 2003-12-18 10:58:18 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -177,8 +177,6 @@ CFLAGS+=-c -nologo -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE) CFLAGS+= -Ob1 .ENDIF # "$(VC_STANDARD)"=="" .ENDIF -.ENDIF -.ENDIF .ELSE # ist keine product... CDEFS+= -D_X86_=1 $(OLE2DEF) CFLAGS+=-c -nologo -Gs $(NOLOGO) $(MINUS_I)$(INCLUDE) |