Merge branch 'master' into sdl2

This commit is contained in:
Zack Middleton 2014-03-24 17:53:08 -05:00
commit c55df2c9aa
73 changed files with 60614 additions and 31 deletions

View file

@ -2008,7 +2008,6 @@ Upload32
===============
*/
extern qboolean charSet;
static void Upload32( byte *data, int width, int height, imgType_t type, imgFlags_t flags,
qboolean lightMap, GLenum internalFormat, int *pUploadWidth, int *pUploadHeight)
{