From 9eba5bdeb177c84e00949890204f0cb5aaab02d8 Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith <gsmith@apache.org> Date: Tue, 15 Sep 2015 18:21:04 +0000 Subject: [PATCH] remove unwanted/needed merge remnants change base address git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703270 13f79535-47bb-0310-9956-ffa450edef68 --- BuildBin.dsp | 4 ++-- os/win32/BaseAddr.ref | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BuildBin.dsp b/BuildBin.dsp index 84143ca124..5707042fbd 100644 --- a/BuildBin.dsp +++ b/BuildBin.dsp @@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug # PROP Use_Debug_Libraries 0 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _dummy" +# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _dummy" # PROP Rebuild_Opt "" # PROP Target_File "\Apache2\bin\httpd.exe" # PROP Bsc_Name ".\Browse\httpd.bsc" @@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug # PROP Use_Debug_Libraries 1 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _dummy" +# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _dummy" # PROP Rebuild_Opt "" # PROP Target_File "\Apache2\bin\httpd.exe" # PROP Bsc_Name ".\Browse\httpd.bsc" diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 1a221f87a1..5fa19bdd1e 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -127,5 +127,4 @@ mod_optional_fn_import.so 0x70BC0000 0x00010000 mod_optional_hook_export.so 0x70BD0000 0x00010000 mod_optional_hook_import.so 0x70BE0000 0x00010000 mod_authnz_fcgi.so 0x70BF0000 0x00020000 -mod_h2.so 0x70D00000 0x00020000 ->>>>>>> .merge-right.r1698023 +mod_h2.so 0x70C10000 0x00020000 -- GitLab