Merge branch 'public_next' (58a844d3) · Commits · STJr / SRB2 · GitLab

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

58a844d3

Commit 58a844d3 authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/r_things.c
#	src/v_video.c

parents cddb743f 61836e15

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/g_game.c 21 additions, 15 deletions

src/g_game.c
src/r_data.c 11 additions, 11 deletions

src/r_data.c
src/r_plane.c 13 additions, 2 deletions

src/r_plane.c
src/r_things.c 3 additions, 2 deletions

src/r_things.c
src/v_video.c 17 additions, 12 deletions

src/v_video.c

with 65 additions and 42 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