Merge branch '2022' into 'next' (f7eafeb6) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f7eafeb6

Commit f7eafeb6 authored 3 years ago by sphere

Downloads
- Plain Diff

Merge branch '2022' into 'next'

2022

See merge request !1754

parents 1abe2689 14295ac7

No related branches found

No related tags found

Loading

Changes 231

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 2 additions, 2 deletions

src/Makefile
src/am_map.c 1 addition, 1 deletion

src/am_map.c
src/am_map.h 1 addition, 1 deletion

src/am_map.h
src/apng.c 1 addition, 1 deletion

src/apng.c
src/apng.h 1 addition, 1 deletion

src/apng.h
src/asm_defs.inc 1 addition, 1 deletion

src/asm_defs.inc
src/b_bot.c 1 addition, 1 deletion

src/b_bot.c
src/b_bot.h 1 addition, 1 deletion

src/b_bot.h
src/byteptr.h 1 addition, 1 deletion

src/byteptr.h
src/command.c 1 addition, 1 deletion

src/command.c
src/command.h 1 addition, 1 deletion

src/command.h
src/console.c 1 addition, 1 deletion

src/console.c
src/console.h 1 addition, 1 deletion

src/console.h
src/d_clisrv.c 1 addition, 1 deletion

src/d_clisrv.c
src/d_clisrv.h 1 addition, 1 deletion

src/d_clisrv.h
src/d_event.h 1 addition, 1 deletion

src/d_event.h
src/d_main.c 2 additions, 2 deletions

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

src/d_main.h
src/d_net.c 1 addition, 1 deletion

src/d_net.c
src/d_net.h 1 addition, 1 deletion

src/d_net.h

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