Merge branch 'master' into next (e727fea4) · 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

e727fea4

Commit e727fea4 authored 8 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' into next

parents 87dc33a7 b1168b17

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/screen.c 1 addition, 1 deletion

src/screen.c
src/v_video.c 1 addition, 1 deletion

src/v_video.c

with 3 additions and 3 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