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 2013-05-08 14:27:15 +01:00

parent b9355c5f12 42eeb7551d

commit d9d52f0306

427 changed files with 66082 additions and 14083 deletions

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

1096

Makefile

View file

File diff suppressed because it is too large Load diff