Merge branch 'master' into sdl2
Conflicts: code/sdl/sdl_input.c
This commit is contained in:
commit
bde7665462
97 files changed
+6333
-546
No files matched your search
@@ -2652,8 +2652,6 @@ extern int max_polyverts;
|
||||
|
||||
extern backEndData_t *backEndData; // the second one may not be allocated
|
||||
|
||||
extern volatile renderCommandList_t *renderCommandList;
|
||||
|
||||
|
||||
void *R_GetCommandBuffer( int bytes );
|
||||
void RB_ExecuteRenderCommands( const void *data );
|
||||
|
||||
Reference in new issue
Block a user