Merge branch 'next' into hotfix_thinkers.iterate (9f3fda37) · Commits · STJr / SRB2 · GitLab

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

9f3fda37

Commit 9f3fda37 authored 7 years ago by Yukita Mayako Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'next' into hotfix_thinkers.iterate

parents e192c5be 22232832

No related branches found

No related tags found

2 merge requests!252OpenGL: Public flatsprite: The Fixening,!203Fixes for Each Time and P_IsObjectOnGroundIn

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
src/doomdef.h 4 additions, 4 deletions

src/doomdef.h
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

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

with 10 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