Merge remote-tracking branch 'origin/master' into divVerent/libavcodec

author Rudolf Polzer <divverent@xonotic.org>

Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)

committer Rudolf Polzer <divverent@xonotic.org>

Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)
author Rudolf Polzer <divverent@xonotic.org>
Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)
committer Rudolf Polzer <divverent@xonotic.org>
Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)
diff --cc cl_screen.c
Simple merge
diff --cc client.h
Simple merge
diff --cc makefile.inc
Simple merge
author	Rudolf Polzer <divverent@xonotic.org>
	Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)
committer	Rudolf Polzer <divverent@xonotic.org>
	Sun, 29 May 2011 12:45:19 +0000 (14:45 +0200)
		1	2
cl_screen.c	patch \|	diff1 \|	diff2 \|	blob \| history
client.h	patch \|	diff1 \|	diff2 \|	blob \| history
makefile.inc	patch \|	diff1 \|	diff2 \|	blob \| history