Merge branch 'master' into sdl2

Browse Source

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

...

This commit is contained in:

Tim Angus committed 2013-05-08 14:27:15 +01:00

2 parents b9355c5f12 42eeb7551d

commit d9d52f0306

427 files changed

+66082 -14083

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/renderergl2/tr_init.c

+1574

File diff suppressed because it is too large. Load diff