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

..

AL

5882 - Update OpenAL Headers to OpenAL Soft 1.15.1

2013-02-17 07:34:41 -06:00

asm

Fix some clang warnings

2013-03-12 21:50:59 +00:00

botlib

Give botlib com_basegame for botlib.log path

2013-04-22 23:11:10 -05:00

cgame

renderer -> renderergl1, rend2 -> renderergl2

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

client

Merge branch 'master' into sdl2

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

game

Correct TeamCount return type and team argument type

2013-04-26 15:46:12 -05:00

jpeg-8c

Mark JPEG lib changes, file provided by Simon McVittie

2012-07-01 18:07:56 +00:00

libcurl/curl

* add cURL support for HTTP/FTP downloading (bug 2661)

2006-09-11 16:41:55 +00:00

libogg-1.3.0

Fix last commit

2013-02-17 20:42:18 -06:00

libs

Update bundled SDL headers/libs

2013-01-21 22:40:05 +00:00

libspeex

Bug 5094 - Code cleanup, patch by Zack Middleton and DevHC. Fixes unused-but-set gcc warnings

2011-07-29 12:27:00 +00:00

null

Add renderercommon/tr_common.h

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

opus-1.0.2

Add libopus 1.0.2 and libopusfile 0.2

2013-02-17 18:33:39 -06:00

opusfile-0.2

Fix some clang warnings

2013-03-12 21:50:59 +00:00

q3_ui

renderer -> renderergl1, rend2 -> renderergl2

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

qcommon

Rename FS_CheckFilenameIsNotImmutable to ..IsMutable

2013-04-24 14:45:37 -05:00

renderercommon

Merge branch 'master' into sdl2

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

renderergl1

Merge branch 'master' into sdl2

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

renderergl2

Merge branch 'master' into sdl2

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

sdl

Merge branch 'master' into sdl2

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

SDL2/include

Update bundled SDL headers/libs

2013-01-21 22:40:05 +00:00

server

Give botlib com_basegame for botlib.log path

2013-04-22 23:11:10 -05:00

sys

Merge branch 'master' into sdl2

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

tools

Fix memmove()

2013-04-14 20:08:08 +01:00

ui

Fix comment for gametype parsing in ui

2013-02-27 16:09:10 -06:00

zlib

- Tested and updated MSVC project file to really make it work with new zlib

2009-10-19 16:16:52 +00:00