git.rm.cloudns.org Git - xonotic/darkplaces.git/commit

]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit

projects / xonotic / darkplaces.git / commit

author	divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
	Sat, 27 Jul 2013 10:36:19 +0000 (10:36 +0000)
committer	Rudolf Polzer <divverent@xonotic.org>
	Sat, 27 Jul 2013 10:37:37 +0000 (12:37 +0200)
commit	c1d4a643adf18663ebfa28124029bc2caab52205
tree	83f5ddc36f80ef749bf35671a8106472b160a080	tree \| snapshot
parent	eaf473870a0f2f68031a49d77531ef9fc2cdfeb1	commit \| diff

Revert "Make cdda optional, server does not need to play music" because it
depends on having separate build directories. No hard feelings, Nikoli, when
separate build directories work again, feel free to revert this revert.

This reverts commit 97b79884ee55276e90c4dd60f9bfde8b9dbbff68.

Conflicts:
makefile.inc

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11986 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9804c2369e4ac79331fc05bf37655bdf76457f2d

BSDmakefile		diff \| blob \| history
cl_parse.c		diff \| blob \| history
host.c		diff \| blob \| history
makefile		diff \| blob \| history
makefile.inc		diff \| blob \| history
menu.c		diff \| blob \| history
prvm_cmds.c		diff \| blob \| history
snd_main.c		diff \| blob \| history
vid_shared.c		diff \| blob \| history
vid_wgl.c		diff \| blob \| history

RSS Atom