stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-20 09:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hahaha funny merge conflict

Browse source
This commit is contained in:
James R 2020-07-05 17:10:28 -07:00
parent c01f765712
commit 4f1b613b5b
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/hu_stuff.c
View file

@ -177,7 +177,6 @@ void HU_LoadGraphics(void)
// minus for negative tallnums
tallminus = HU_CachePatch("STTMINUS");
>>>>>>> 0a7f23e5e... Set up with the font system
// cache the crosshairs, don't bother to know which one is being used,
// just cache all 3, they're so small anyway.