7 commits

Author	SHA1	Message	Date
Inuyasha	ff4b39bab4	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into nix-srb1 ... # Conflicts: # src/info.c	2016-10-05 18:47:32 -07:00
Alam Ed Arias	032313260a	Merge branch 'public_next' into master	2016-05-20 17:58:57 -04:00
Inuyasha	f07585191b	copyright dates/statements updated and such ... (no actual SLOC changes)	2016-05-17 17:42:11 -07:00
Inuyasha	1ee01063e3	All SRB1 objects, states, and sprites removed.	2016-03-09 02:54:09 -08:00
Sryder13	5209787ebd	Rename Colours	2015-07-25 14:07:05 +01:00
Alam Ed Arias	7cb77075d1	SRB2 2.1.11 release	2014-08-26 23:56:30 -04:00
Alam Ed Arias	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00