Merge branch 'master' into 'master' (bd2bfe46) · Commits · John Peter Sa / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

bd2bfe46

Commit bd2bfe46 authored 2 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Cleanup whitespaces and ignore build folders

See merge request STJr/SRB2!1859

parents e8a6026c e1fd0dfc

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 1 addition, 1 deletion

.circleci/config.yml
.gitignore 2 additions, 0 deletions

.gitignore
extras/conf/SRB2-22.cfg 1 addition, 1 deletion

extras/conf/SRB2-22.cfg
src/b_bot.c 5 additions, 5 deletions

src/b_bot.c
src/blua/liolib.c 0 additions, 1 deletion

src/blua/liolib.c
src/d_player.h 2 additions, 2 deletions

src/d_player.h
src/hardware/hw_main.c 2 additions, 2 deletions

src/hardware/hw_main.c
src/p_enemy.c 1 addition, 1 deletion

src/p_enemy.c
src/p_mobj.c 1 addition, 1 deletion

src/p_mobj.c
src/p_saveg.c 3 additions, 3 deletions

src/p_saveg.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/p_user.c 6 additions, 5 deletions

src/p_user.c
src/r_skins.c 1 addition, 1 deletion

src/r_skins.c
src/s_sound.c 4 additions, 4 deletions

src/s_sound.c
src/sdl/i_video.c 2 additions, 1 deletion

src/sdl/i_video.c
tools/masterserver/structure.sql 2 additions, 2 deletions

tools/masterserver/structure.sql

with 34 additions and 31 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