]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge branch 'master' into divVerent/libavcodec
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Feb 2011 17:24:42 +0000 (18:24 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Feb 2011 17:24:42 +0000 (18:24 +0100)
commit85c656bb0b42665eec41831a9dc83b58dbd29487
treeaf47e449ed0776566e16743716ab015173a6bfe6
parent4631bf5907a7e2989791018859dbcb7382555bf2
parent83d0515e854d7acf232a792868fe330bdbd716bf
Merge branch 'master' into divVerent/libavcodec
cl_screen.c
client.h
makefile.inc