Merge commit '2234d36c7a'
# Conflicts: # src/r_main.cpp # src/r_plane.cpp # src/r_things.cpp
This commit is contained in:
commit
2b8db72cef
37 changed files with 1967 additions and 15 deletions
|
|
@ -44,6 +44,7 @@
|
|||
#include "gl/gl_functions.h"
|
||||
#include "serializer.h"
|
||||
#include "g_levellocals.h"
|
||||
#include "events.h"
|
||||
|
||||
#include "gl/dynlights/gl_lightbuffer.h"
|
||||
#include "gl/system/gl_interface.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue