Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

8bd5193e

Commit 8bd5193e authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into sal-oglshaderport

parents d0ee4ad4 a447a3d8

No related branches found

No related tags found

1 merge request!724OpenGL shaders

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 6 additions, 7 deletions

src/d_main.c
src/lua_hooklib.c 1 addition, 1 deletion

src/lua_hooklib.c
src/m_misc.c 7 additions, 6 deletions

src/m_misc.c
src/p_setup.c 1 addition, 2 deletions

src/p_setup.c
src/r_patch.c 10 additions, 1 deletion

src/r_patch.c
src/sdl/i_video.c 1 addition, 6 deletions

src/sdl/i_video.c
src/w_wad.c 23 additions, 17 deletions

src/w_wad.c
src/w_wad.h 3 additions, 4 deletions

src/w_wad.h

with 52 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment