Skip to content
Snippets Groups Projects
Commit a29ced72 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into next

parents e20461aa 628d1c4d
No related branches found
Tags SRB2_release_2.1.17
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/win32/win_main.c
+ 1
− 1
View file @ a29ced72
...@@ -69,7 +69,7 @@ static HCURSOR windowCursor = NULL; // main window cursor ...@@ -69,7 +69,7 @@ static HCURSOR windowCursor = NULL; // main window cursor
static LPCSTR wClassName = "SRB2WC"; static LPCSTR wClassName = "SRB2WC";
boolean appActive = false; // app window is active INT appActive = false; // app window is active
#ifdef LOGMESSAGES #ifdef LOGMESSAGES
FILE *logstream; FILE *logstream;
......
src/win32/win_main.h
+ 1
− 1
View file @ a29ced72
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
extern HWND hWndMain; extern HWND hWndMain;
extern boolean appActive; extern INT appActive;
VOID I_GetSysMouseEvents(INT mouse_state); VOID I_GetSysMouseEvents(INT mouse_state);
extern UINT MSHWheelMessage; extern UINT MSHWheelMessage;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment