Merge branch 'master' into sdl2

This commit is contained in:
Zack Middleton committed 2014-03-24 17:53:08 -05:00
commit c55df2c9aa
73 files changed
+60614 -31

No files matched your search

-1
View File
@@ -552,7 +552,6 @@ Upload32
===============
*/
extern qboolean charSet;
static void Upload32( unsigned *data,
int width, int height,
qboolean mipmap,