Merge branch 'master' into glew

This commit is contained in:
Robert Beckebans 2014-02-15 11:53:30 +01:00
commit dd22a2a85a

View file

@ -73,6 +73,7 @@ void idMenuScreen_Shell_Credits::SetupCreditList()
creditList.Append( creditInfo_t( 1, "Additional Programming" ) );
creditList.Append( creditInfo_t( 0, "Daniel Gibson - Tons of code cleanups, netcode++" ) );
creditList.Append( creditInfo_t( 0, "Jonathan Young - Bugfixes, misc improvements" ) );
creditList.Append( creditInfo_t( 0, "Felix Rueegg - Doomclassic Linux support" ) );
creditList.Append( creditInfo_t() );
creditList.Append( creditInfo_t( 0, "For more see the GitHub stats ;)" ) );
creditList.Append( creditInfo_t() );