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

c23d971b

Commit c23d971b authored 9 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'master' into next

parents a567ce8e a3c01ea6

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 9 additions, 2 deletions

.travis.yml
src/doomtype.h 0 additions, 1 deletion

src/doomtype.h
src/md5.c 1 addition, 1 deletion

src/md5.c
src/sdl/CMakeLists.txt 7 additions, 6 deletions

src/sdl/CMakeLists.txt
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 0 deletions

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
src/string.c 4 additions, 0 deletions

src/string.c

with 23 additions and 10 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