Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2017-01-16 16:41:38 -05:00
commit a29ced725d
2 changed files with 2 additions and 2 deletions

View File

@ -69,7 +69,7 @@ static HCURSOR windowCursor = NULL; // main window cursor
static LPCSTR wClassName = "SRB2WC";
boolean appActive = false; // app window is active
INT appActive = false; // app window is active
#ifdef LOGMESSAGES
FILE *logstream;

View File

@ -23,7 +23,7 @@
extern HWND hWndMain;
extern boolean appActive;
extern INT appActive;
VOID I_GetSysMouseEvents(INT mouse_state);
extern UINT MSHWheelMessage;