Tim Angus d9d52f0306 Merge branch 'master' into sdl2 ...

Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c

2013-05-08 14:27:15 +01:00

..

iqm.h

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

qgl.h

Move renderers a bit closer together

2013-03-12 17:52:29 +00:00

tr_common.h

Fix USE_FREETYPE breakage

2013-03-12 19:41:52 +00:00

tr_font.c

Move renderers a bit closer together

2013-03-12 17:52:29 +00:00

tr_image_bmp.c

Fix some of the things clang --analyze flagged

2013-03-26 16:50:03 +00:00

tr_image_jpg.c

Add renderercommon/tr_common.h

2013-02-16 20:58:04 +00:00

tr_image_pcx.c

Add renderercommon/tr_common.h

2013-02-16 20:58:04 +00:00

tr_image_png.c

Fix some of the things clang --analyze flagged

2013-03-26 16:50:03 +00:00

tr_image_tga.c

Fix some of the things clang --analyze flagged

2013-03-26 16:50:03 +00:00

tr_noise.c

Add renderercommon/tr_common.h

2013-02-16 20:58:04 +00:00

tr_public.h

Merge branch 'master' into sdl2

2013-05-08 14:27:15 +01:00

tr_types.h

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00