Merge branch 'master' into sdl2

2014-03-24 17:53:08 -05:00 · 2014-03-24 17:53:08 -05:00 · c55df2c9aa
commit c55df2c9aa
parent 8b06986a9f 63463d1bcf
73 changed files with 60614 additions and 31 deletions
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@ -552,7 +552,6 @@ Upload32

 ===============
 */
-extern qboolean charSet;
 static void Upload32( unsigned *data, 
 						  int width, int height, 
 						  qboolean mipmap,