Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
b48c1d1c
Commit
b48c1d1c
authored
6 years ago
by
Nev3r
Browse files
Options
Downloads
Plain Diff
Merge branch 'PK3-BackportNext' of
https://github.com/Nevur/SRB2
into PK3-BackportNext
# Conflicts: # src/w_wad.c
parents
7dd6692f
1113849f
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!488
Merge in next and don't billboard papersprites in GL
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/m_argv.c
+1
-1
1 addition, 1 deletion
src/m_argv.c
with
1 addition
and
1 deletion
src/m_argv.c
+
1
−
1
View file @
b48c1d1c
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment