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

9007904a

Commit 9007904a authored 9 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' into damage-control

# Conflicts:
#	src/p_inter.c
#	src/p_mobj.c

parents d31fd95d b51a1148

Branches

Tags

Loading

Changes 698

Hide whitespace changes

Inline Side-by-side

Showing

.gitattributes 0 additions, 16 deletions

.gitattributes
.gitignore 5 additions, 0 deletions

.gitignore
.travis.yml 3 additions, 3 deletions

.travis.yml
SRB2_Debug.props 28 additions, 0 deletions

SRB2_Debug.props
SRB2_Release.props 30 additions, 0 deletions

SRB2_Release.props
SRB2_common.props 46 additions, 0 deletions

SRB2_common.props
appveyor.yml 38 additions, 28 deletions

appveyor.yml
comptime.props 13 additions, 0 deletions

comptime.props
comptime.sh 1 addition, 1 deletion

comptime.sh
libs/.gitattributes 8 additions, 0 deletions

libs/.gitattributes
libs/FMOD.props 21 additions, 0 deletions

libs/FMOD.props
libs/SDL2.props 15 additions, 0 deletions

libs/SDL2.props
libs/SDL2/BUGS.txt 16 additions, 0 deletions

libs/SDL2/BUGS.txt
libs/SDL2/COPYING.txt 20 additions, 0 deletions

libs/SDL2/COPYING.txt
libs/SDL2/CREDITS.txt 53 additions, 0 deletions

libs/SDL2/CREDITS.txt
libs/SDL2/INSTALL.txt 15 additions, 0 deletions

libs/SDL2/INSTALL.txt
libs/SDL2/Makefile 29 additions, 0 deletions

libs/SDL2/Makefile
libs/SDL2/README-SDL.txt 13 additions, 0 deletions

libs/SDL2/README-SDL.txt
libs/SDL2/README.txt 21 additions, 0 deletions

libs/SDL2/README.txt
libs/SDL2/WhatsNew.txt 199 additions, 0 deletions

libs/SDL2/WhatsNew.txt

with 574 additions and 48 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