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

cb9f07fa

Commit cb9f07fa authored 11 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge branch 'master' into sdl2

parents 65c75f41 d7101607

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

readme.txt 1 addition, 1 deletion

readme.txt
src/hardware/hw_main.c 48 additions, 10 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 3 additions, 2 deletions

src/hardware/hw_md2.c
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj

with 54 additions and 15 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