4 commits

Author	SHA1	Message	Date
TehRealSalt	b12872af02	what is this bullshit?! ... r_local.h just got completely overwritten by a copy of r_draw.h.....	2018-03-12 01:21:35 -04:00
TehRealSalt	79ba08ac7d	Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems ... # Conflicts: # src/d_netcmd.c # src/g_game.c # src/k_kart.c # src/p_enemy.c # src/p_inter.c # src/p_map.c # src/p_user.c # src/sounds.c # src/sounds.h # src/y_inter.c	2018-03-12 00:58:13 -04:00
ZTsukei	e4a970f894	Starting from scratch. SRB2 v2.1.15	2016-07-06 00:10:19 -04:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00