]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge branch 'master' into divVerent/libavcodec
authorRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jun 2011 20:15:57 +0000 (22:15 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jun 2011 20:15:57 +0000 (22:15 +0200)
commit4dd3180e269048c3b99801967f41097c1ad9b400
treea74cc35727835a4286db7ce6fd85609f3b40d3f7
parent72a029f43e177c0940ea6a4819b3322f7d17600e
parent55c3001cc18a0c55096bd3bb04af734df7e8025b
Merge branch 'master' into divVerent/libavcodec
cl_screen.c
client.h
makefile.inc