From 5271db81b786172adfdbe4156037cf28c663417e Mon Sep 17 00:00:00 2001 From: SteelT Date: Mon, 10 Aug 2020 15:41:49 -0400 Subject: [PATCH] Merge win32/win_dll.c --- src/win32/win_dll.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c index 2f50a63e4..f492cd92d 100644 --- a/src/win32/win_dll.c +++ b/src/win32/win_dll.c @@ -86,9 +86,6 @@ static VOID UnloadDLL (HMODULE* pModule) // ========================================================================== // note : the 3D driver loading should be put somewhere else.. -<<<<<<< HEAD -======= - #ifdef HWRENDER static HMODULE hwdModule = NULL; @@ -173,7 +170,6 @@ VOID Shutdown3DDriver (VOID) } #endif ->>>>>>> srb2/next #ifdef HW3SOUND static HMODULE hwsModule = NULL;