Tags: mkrupczak3/gzdoom
Tags
Merge branch 'master' into portals # Conflicts: # src/actor.h # src/gl/scene/gl_portal.h # src/gl/scene/gl_sky.cpp # src/gl/scene/gl_wall.h # src/gl/scene/gl_walls.cpp # src/p_local.h # src/p_map.cpp # src/p_spec.cpp # src/r_data/r_interpolate.cpp # wadsrc/static/xlat/eternity.txt (note: this has not been tested. It may not compile!)
Merge branch 'maint' of https://github.com/rheit/zdoom into maint2.1 # Conflicts: # src/version.h
Merge branch 'maint' of https://github.com/rheit/zdoom into maint1.9
PreviousNext