Commit 9eba5bde authored by Gregg Lewis Smith's avatar Gregg Lewis Smith
Browse files

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
parent 457bbe34

BuildBin.dsp

+2 −2
Original line number Diff line number Diff line
@@ -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"

os/win32/BaseAddr.ref

+1 −2
Original line number Diff line number Diff line
@@ -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